Merge "Purge un-needed references to lithium stream"

[releng/builder.git] / jjb / autorelease / include-raw-autorelease-maven-deploy.sh

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index 8bf44222416baeb9048907f0aadb2d861a23e910..630a2206c67e56fff3fa2725a72abd75a860d6fa 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -9,39 +9,18 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-# Job will pass in a variable ${DATESTAMP} if this variable is false than we
-# we are likely releasing a release candidate. We should skip closing the
-# Nexus staging repository so that we can sign the artifacts.
-SKIP_STAGING_CLOSE=false
-if [ "${DATESTAMP}" == "false" ]
-then
-    SKIP_STAGING_CLOSE=true
-fi
-
-mkdir -p hide/from/pom/files
+# Assuming that mvn deploy created the hide/from/pom/files/stage directory.
 cd hide/from/pom/files
 mkdir -p m2repo/org/opendaylight/
 
-(IFS='
-'
-for m in `xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' ../../../../pom.xml`; do
-    rsync -avz --exclude 'maven-metadata*' \
-               --exclude '_remote.repositories' \
-               --exclude 'resolver-status.properties' \
-               "/tmp/r/org/opendaylight/$m" m2repo/org/opendaylight/
-done)
-
-# Add exception for integration project since they release under the
-# integration top-level project.
 rsync -avz --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
-           "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/
+           "stage/org/opendaylight" m2repo/org/
 
-mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
-    -DskipStagingRepositoryClose=${SKIP_STAGING_CLOSE} \
+"$MVN" -V -B org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
     -DrepositoryDirectory="`pwd`/m2repo" \
-    -DnexusUrl=http://nexus.opendaylight.org/ \
+    -DnexusUrl=https://nexus.opendaylight.org/ \
     -DstagingProfileId="425e43800fea70" \
     -DserverId="opendaylight.staging" \
     -s $SETTINGS_FILE \