Fixed maven deployment issues for new versioning scheme.

2 files changed, 20 insertions, 15 deletions

diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index ea9026a766..e0f31a5db2 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -16,10 +16,15 @@
     <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" />
-
+    <condition property="version.is.snapshot">
+      <contains string="${maven.version.number}" substring="-SNAPSHOT"/>
+    </condition>
+    
     <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>
+
+    
   </target>
 
   <target name="init.maven" depends="init.properties">
@@ -241,28 +246,31 @@
   </target>
 
   <!-- Local Targets -->
-  <target name="deploy.snapshot.local" depends="deploy.local.init" description="Deploys the bundled snapshot of the Scala Lanaguage to a local maven repository">
-    <deploy-local-all version="${maven.snapshot.version.number}" repository="${local.snapshot.repository}" />
+  <target name="deploy.snapshot.local" depends="deploy.local.init" if="version.is.snapshot" description="Deploys the bundled snapshot of the Scala Lanaguage to a local maven repository">
+    <deploy-local-all version="${maven.version.number}" repository="${local.snapshot.repository}" />
   </target>
 
-  <target name="deploy.release.local" depends="deploy.local.init" description="Deploys the bundled files as a release into the local Maven repository">
+  <target name="deploy.release.local" depends="deploy.local.init" unless="version.is.snapshot" description="Deploys the bundled files as a release into the local Maven repository">
     <deploy-local-all version="${maven.version.number}" repository="${local.release.repository}" />
   </target>
+  <target name="deploy.local" depends="deploy.snapshot.local, deploy.release.local" description="Deploys the bundle files to the local maven repo."/>
 
-  <!-- Remote Targets -->
-  <target name="deploy.signed.snapshot" depends="deploy.remote.init" description="Deploys the bundled files as a snapshot into the desired remote Maven repository">
-      <deploy-remote-signed-all version="${maven.snapshot.version.number}" repository="${remote.snapshot.repository}" />
+  <!-- Remote Signed Targets -->
+  <target name="deploy.signed.snapshot" depends="deploy.remote.init" if="version.is.snapshot" description="Deploys the bundled files as a snapshot into the desired remote Maven repository">
+      <deploy-remote-signed-all version="${maven.version.number}" repository="${remote.snapshot.repository}" />
   </target>
 
-  <target name="deploy.signed.release" depends="deploy.remote.init" description="Deploys the bundled files as a release into the desired remote Maven repository">
+  <target name="deploy.signed.release" depends="deploy.remote.init" unless="version.is.snapshot" description="Deploys the bundled files as a release into the desired remote Maven repository">
     <deploy-remote-signed-all version="${maven.version.number}" repository="${remote.release.repository}" />
   </target>
-
-  <target name="deploy.snapshot" depends="deploy.remote.init" description="Deploys the bundled files as a snapshot into the desired remote Maven repository">
-      <deploy-remote-all version="${maven.snapshot.version.number}" repository="${remote.snapshot.repository}" />
+  <target name="deploy.signed" depends="deploy.signed.release, deploy.signed.snapshot" description="Deploys signed bundles to remote repo"/>
+  <!-- Remote unsigned targets -->
+  <target name="deploy.snapshot" depends="deploy.remote.init" if="version.is.snapshot" description="Deploys the bundled files as a snapshot into the desired remote Maven repository">
+      <deploy-remote-all version="${maven.version.number}" repository="${remote.snapshot.repository}" />
   </target>
 
-  <target name="deploy.release" depends="deploy.remote.init" description="Deploys the bundled files as a release into the desired remote Maven repository">
+  <target name="deploy.release" depends="deploy.remote.init" unless="version.is.snapshot" description="Deploys the bundled files as a release into the desired remote Maven repository">
     <deploy-remote-all version="${maven.version.number}" repository="${remote.release.repository}" />
   </target>
+  <target name="deploy" depends="deploy.snapshot, deploy.release" description="Deploys unsigned artifacts to the maven repo."/>
 </project>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index 56b1067a32..b7e7b7ae2b 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -309,9 +309,6 @@ MAIN DISTRIBUTION SBAZ
     <copy tofile="${dists.dir}/maven/${version.number}/build.xml"
           file="${src.dir}/build/maven/maven-deploy.xml"/>
     <!-- export properties for use when deploying -->
-    <!-- TODO - Fix this setup, now that we have a final maven-version... ->
-    <property name="maven.snapshot.version.number"
-              value="${version.major}.${version.minor}.${version.patch}-SNAPSHOT"/>
     <echoproperties destfile="${dists.dir}/maven/${version.number}/build.properties"/>
   </target>