Fix the maven deployment script to use repository.apache.org instead of the people...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1640337 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven/mvn-deploy.sh b/maven/mvn-deploy.sh
index 9c0c8eb3689c1af17f3550755459c8e25b9de0a8..2d609e491f5761e5730b1de56b1db699786ccaa9 100755 (executable)
--- a/maven/mvn-deploy.sh
+++ b/maven/mvn-deploy.sh
@@ -22,7 +22,7 @@
 #    <server>
 #      <id>apache-releases</id>
 #      <username>apacheId</username>
-#      <privateKey>/path/to/private/key</privateKey>
+#      <password>mySecurePassw0rd</password>
 #    </server>
 #
 #   <profiles>
@@ -38,33 +38,25 @@
 #   1. ant dist
 #   2. cd build/dist
 #   3. ./mvn-deploy.sh 
-# @author Yegor Kozlov
 
-M2_REPOSITORY=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository
-M2_SCP=people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository
+M2_REPOSITORY=M2_REPOSITORY=https://repository.apache.org/service/local/staging/deploy/maven2
 
 VERSION=@VERSION@
 DSTAMP=@DSTAMP@
 
 for artifactId in poi poi-scratchpad poi-ooxml poi-examples poi-ooxml-schemas poi-excelant
 do
-  mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases -P apache-releases \
-    -Durl=$M2_REPOSITORY \
-    -Dfile=$artifactId-$VERSION-$DSTAMP.jar -DpomFile=$artifactId-$VERSION.pom
-  #The maven sign-and-deploy-file command does NOT sign POM files, so we have to upload the POM's .asc manually
-  scp $artifactId-$VERSION.pom.asc $M2_SCP/org/apache/poi/$artifactId/$VERSION/
-
+  SENDS="-Dfile=$artifactId-$VERSION-$DSTAMP.jar"
+  SENDS="$SENDS -DpomFile=$artifactId-$VERSION.pom"
   if [ -r $artifactId-$VERSION-sources-$DSTAMP.jar ]; then
-    mvn deploy:deploy-file -DrepositoryId=apache-releases -P apache-releases \
-      -Durl=$M2_REPOSITORY -DgeneratePom=false -Dpackaging=java-source \
-      -Dfile=$artifactId-$VERSION-sources-$DSTAMP.jar -DpomFile=$artifactId-$VERSION.pom
-    scp $artifactId-$VERSION-sources-$DSTAMP.jar.asc $M2_SCP/org/apache/poi/$artifactId/$VERSION/$artifactId-$VERSION-sources.jar.asc
+     SENDS="$SENDS -Dsources=$artifactId-$VERSION-sources-$DSTAMP.jar"
   fi
-
   if [ -r $artifactId-$VERSION-javadocs-$DSTAMP.jar ]; then
-    mvn deploy:deploy-file -DrepositoryId=apache-releases -P apache-releases \
-      -Durl=$M2_REPOSITORY -DgeneratePom=false -Dpackaging=javadoc \
-      -Dfile=$artifactId-$VERSION-javadocs-$DSTAMP.jar -DpomFile=$artifactId-$VERSION.pom
-    scp $artifactId-$VERSION-javadocs-$DSTAMP.jar.asc $M2_SCP/org/apache/poi/$artifactId/$VERSION/$artifactId-$VERSION-javadocs.jar.asc
+     SENDS="$SENDS -Dsources=$artifactId-$VERSION-javadocs-$DSTAMP.jar"
   fi
+
+  mvn gpg:sign-and-deploy-file \
+    -DrepositoryId=apache-releases -P apache-releases \
+    -Durl=$M2_REPOSITORY \
+    $SENDS
 done