From 9c46b97414a1d4a64bf076fdf2ff009f010c33bc Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Mon, 21 Oct 2013 12:07:59 -0700
Subject: Support publishing to maven from main build

Publish to maven with `ant publish.local`,
`ant publish`, or `ant publish.signed`.

For now, we must keep copying `src/build/maven/maven-deploy.xml`
to `dists/maven/latest.build.xml`, along with its dependencies,
as it's used by jenkins jobs and PR validation.

TODO: `inline src/build/maven/maven-deploy.xml` into `build.xml`.
---
 build.xml                        |  28 ++++++
 src/build/maven/maven-deploy.xml | 201 ++++++++++++++++++++-------------------
 2 files changed, 129 insertions(+), 100 deletions(-)

diff --git a/build.xml b/build.xml
index 7c35fc0fe7..6c20d8d9ff 100755
--- a/build.xml
+++ b/build.xml
@@ -4,6 +4,7 @@
   xmlns:artifact="urn:maven-artifact-ant"
   xmlns:rsel="antlib:org.apache.tools.ant.types.resources.selectors">
   <include file="test/build-partest.xml" as="partest"/>
+  <include file="src/build/maven/maven-deploy.xml" as="maven-deploy"/>
 
   <description>
 SuperSabbus for Scala core, builds the scala library and compiler. It can also package it as a simple distribution, tests it for stable bootstrapping and against the Scala test suite.
@@ -2202,10 +2203,37 @@ MAIN DISTRIBUTION PACKAGING
           file="${src.dir}/build/maven/maven-deploy.xml"/>
     <!-- export properties for use when deploying -->
     <echoproperties destfile="${maven-base}/build.properties"/>
+  </target>
+
+  <!-- keep these properties out of ${maven-base}/build.properties, dumped in pack-maven.done -->
+  <target name="init.maven" depends="init">
+    <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" />
+    <property name="remote.release.repository"  value="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
+
+    <property name="local.snapshot.repository" value="${user.home}/.m2/repository" />
+    <property name="local.release.repository"  value="${user.home}/.m2/repository" />
 
+    <property name="repository.credentials.id" value="sonatype-nexus" />
+    <property name="settings.file" value="${user.home}/.m2/settings.xml" />
+
+    <if><contains string="${maven.version.number}" substring="-SNAPSHOT"/><then>
+      <property name="remote.repository" value="${remote.snapshot.repository}"/>
+      <property name="local.repository"  value="${local.snapshot.repository}"/>
+    </then><else>
+      <property name="remote.repository" value="${remote.release.repository}"/>
+      <property name="local.repository"  value="${local.release.repository}"/>
+    </else></if>
   </target>
 
 
+<!-- ===========================================================================
+                                  MAVEN PUBLISHING
+============================================================================ -->
+  <!-- TODO: inline maven-deploy.xml here and remove it, once jenkins jobs no longer rely on it -->
+  <target name="publish"        depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the maven repo.">       <deploy dir="${maven-base}/"/> </target>
+  <target name="publish.local"  depends="pack-maven.done, init.maven" description="Publishes unsigned artifacts to the local maven repo."> <deploy dir="${maven-base}/" local="true"/> </target>
+  <target name="publish.signed" depends="pack-maven.done, init.maven" description="Publishes signed artifacts to the remote maven repo.">  <deploy dir="${maven-base}/" signed="true"/> </target>
+
 <!-- ===========================================================================
                                   STABLE REFERENCE (STARR)
 ============================================================================ -->
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index fbd6d4cd51..3607aa5e5e 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -6,10 +6,107 @@
     SuperSabbus extension for deploying a distribution to Maven. THIS FILE IS MEANT TO BE RUN STANDALONE IN THE MAVEN "distpack" DIRECTORY
   </description>
 
-  <target name="boot">
+  <macrodef name="deploy-one">
+    <attribute name="dir" default=""/>
+    <attribute name="name" />
+    <attribute name="version" />
+    <attribute name="local" />
+    <attribute name="signed" />
+
+    <sequential>
+      <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
+
+      <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
+
+      <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
+        <filterset>
+          <filter token="VERSION" value="@{version}" />
+          <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" />
+          <filter token="XML_VERSION" value="${scala-xml.version.number}" />
+          <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
+          <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" />
+          <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
+          <filter token="JLINE_VERSION" value="${jline.version}" />
+        </filterset>
+      </copy>
+      <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
+
+      <if><equals arg1="@{signed}" arg2="false"/><then>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <artifact:deploy file="${path}.jar" settingsFile="${settings.file}">
+            <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
+            <artifact:pom refid="@{name}.pom" />
+            <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+            <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
+          </artifact:deploy>
+        </then><else>
+          <if><isset property="docs.skip"/><then>
+             <artifact:install file="${path}.jar">
+               <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+               <artifact:pom refid="@{name}.pom" />
+               <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+             </artifact:install>
+          </then>
+          <else>
+            <artifact:install file="${path}.jar">
+              <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
+              <artifact:pom refid="@{name}.pom" />
+              <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
+              <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
+            </artifact:install>
+          </else>
+          </if>
+        </else></if>
+      </then><else>
+        <local name="repo"/>
+        <if><equals arg1="@{local}" arg2="false"/><then>
+          <property name="repo" value="${remote.repository}"/>
+        </then><else>
+          <property name="repo" value="${local.repository}"/>
+        </else></if>
+        <artifact:mvn>
+          <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
+          <arg value="-Durl=${repo}" />
+          <arg value="-DrepositoryId=${repository.credentials.id}" />
+          <arg value="-DpomFile=${path}-pom-filtered.xml" />
+          <arg value=   "-Dfile=${path}.jar" />
+          <arg value="-Dsources=${path}-src.jar" />
+          <arg value="-Djavadoc=${path}-docs.jar" />
+          <arg value="-Pgpg" />
+          <arg value="-Dgpg.useagent=true" />
+        </artifact:mvn>
+      </else></if>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="deploy">
+    <attribute name="dir"    default=""/>
+    <attribute name="local"  default="false"/>
+    <attribute name="signed" default="false"/>
+
+    <sequential>
+      <deploy-one dir="@{dir}"          name="scala-actors"   version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-library"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-reflect"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scala-swing"    version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}"          name="scalap"         version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+      <deploy-one dir="@{dir}plugins/" name="continuations"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
+    </sequential>
+  </macrodef>
+
+  <target name="boot.maven">
     <!-- Pull in properties from build -->
     <property file="build.properties" />
+    <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="ant-contrib.jar"/>
+
+    <!-- Add our maven ant tasks -->
+    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
+    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+  </target>
 
+  <target name="init.maven" depends="boot.maven">
     <property name="remote.snapshot.repository" value="https://oss.sonatype.org/content/repositories/snapshots" />
     <property name="remote.release.repository"  value="https://oss.sonatype.org/service/local/staging/deploy/maven2" />
 
@@ -19,15 +116,6 @@
     <property name="repository.credentials.id" value="sonatype-nexus" />
     <property name="settings.file" value="${user.home}/.m2/settings.xml" />
 
-    <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute -->
-    <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="ant-contrib.jar"/>
-
-    <!-- Add our maven ant tasks -->
-    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
-    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-  </target>
-
-  <target name="init" depends="boot">
     <if><contains string="${maven.version.number}" substring="-SNAPSHOT"/><then>
       <property name="remote.repository" value="${remote.snapshot.repository}"/>
       <property name="local.repository"  value="${local.snapshot.repository}"/>
@@ -39,96 +127,9 @@
     <echo>Using server[${repository.credentials.id}] for maven repository credentials.
        Please make sure that your ~/.m2/settings.xml has the needed username/password for this server id
     </echo>
-
-    <macrodef name="deploy-one">
-      <attribute name="dir" default=""/>
-      <attribute name="name" />
-      <attribute name="version" />
-      <attribute name="local" />
-      <attribute name="signed" />
-
-      <sequential>
-        <local name="path"/> <property name="path" value="@{dir}@{name}/@{name}"/>
-
-        <echo>Deploying ${path}-[pom.xml|src.jar|docs.jar].</echo>
-
-        <copy file="${path}-pom.xml" tofile="${path}-pom-filtered.xml" overwrite="true">
-          <filterset>
-            <filter token="VERSION" value="@{version}" />
-            <filter token="SCALA_BINARY_VERSION" value="${scala.binary.version}" />
-            <filter token="XML_VERSION" value="${scala-xml.version.number}" />
-            <filter token="PARSER_COMBINATORS_VERSION" value="${scala-parser-combinators.version.number}" />
-            <filter token="RELEASE_REPOSITORY" value="${remote.release.repository}" />
-            <filter token="SNAPSHOT_REPOSITORY" value="${remote.snapshot.repository}" />
-            <filter token="JLINE_VERSION" value="${jline.version}" />
-          </filterset>
-        </copy>
-        <artifact:pom id="@{name}.pom" file="${path}-pom-filtered.xml" />
-
-        <if><equals arg1="@{signed}" arg2="false"/><then>
-          <if><equals arg1="@{local}" arg2="false"/><then>
-            <artifact:deploy file="${path}.jar" settingsFile="${settings.file}">
-              <artifact:remoteRepository url="${remote.repository}" id="${repository.credentials.id}" />
-              <artifact:pom refid="@{name}.pom" />
-              <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-              <artifact:attach type="jar" file="${path}-docs.jar" classifier="javadoc" />
-            </artifact:deploy>
-          </then><else>
-            <if><isset property="docs.skip"/><then>
-               <artifact:install file="${path}.jar">
-                 <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-                 <artifact:pom refid="@{name}.pom" />
-                 <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-               </artifact:install>
-            </then>
-            <else>
-              <artifact:install file="${path}.jar">
-                <artifact:localRepository path="${local.repository}"  id="${repository.credentials.id}" />
-                <artifact:pom refid="@{name}.pom" />
-                <artifact:attach type="jar" file="${path}-src.jar"  classifier="sources" />
-              </artifact:install>
-            </else>
-            </if>
-          </else></if>
-        </then><else>
-          <local name="repo"/>
-          <if><equals arg1="@{local}" arg2="false"/><then>
-            <property name="repo" value="${remote.repository}"/>
-          </then><else>
-            <property name="repo" value="${local.repository}"/>
-          </else></if>
-          <artifact:mvn>
-            <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file" />
-            <arg value="-Durl=${repo}" />
-            <arg value="-DrepositoryId=${repository.credentials.id}" />
-            <arg value="-DpomFile=${path}-pom-filtered.xml" />
-            <arg value=   "-Dfile=${path}.jar" />
-            <arg value="-Dsources=${path}-src.jar" />
-            <arg value="-Djavadoc=${path}-docs.jar" />
-            <arg value="-Pgpg" />
-            <arg value="-Dgpg.useagent=true" />
-          </artifact:mvn>
-        </else></if>
-      </sequential>
-    </macrodef>
-
-    <macrodef name="deploy">
-      <attribute name="local"  default="false"/>
-      <attribute name="signed" default="false"/>
-
-      <sequential>
-        <deploy-one                name="scala-actors"   version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-compiler" version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-library"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-reflect"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scala-swing"    version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one                name="scalap"         version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-        <deploy-one dir="plugins/" name="continuations"  version="${maven.version.number}" local="@{local}" signed="@{signed}"/>
-      </sequential>
-    </macrodef>
   </target>
 
-  <target name="deploy"        depends="init" description="Deploys unsigned artifacts to the maven repo.">       <deploy/> </target>
-  <target name="deploy.local"  depends="init" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target>
-  <target name="deploy.signed" depends="init" description="Deploys signed artifacts to the remote maven repo.">  <deploy signed="true"/> </target>
+  <target name="deploy"        depends="init.maven" description="Deploys unsigned artifacts to the maven repo.">       <deploy/> </target>
+  <target name="deploy.local"  depends="init.maven" description="Deploys unsigned artifacts to the local maven repo."> <deploy local="true"/> </target>
+  <target name="deploy.signed" depends="init.maven" description="Deploys signed artifacts to the remote maven repo.">  <deploy signed="true"/> </target>
 </project>
-- 
cgit v1.2.3