diff --git a/maven/mvn-deploy.sh b/maven/mvn-deploy.sh
index 5be574a02..e228addf0 100755
--- a/maven/mvn-deploy.sh
+++ b/maven/mvn-deploy.sh
@@ -25,24 +25,41 @@
# /path/to/private/key
#
#
+#
+#
+# apache-releases
+#
+#
+#
+#
+#
+#
# Usage:
# 1. ant dist
-# 2. cd dist
+# 2. cd build/dist
# 3. ./mvn-deploy.sh
# @author Yegor Kozlov
-M2_REPOSITORY=@REPOSITORY@
+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
-mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases \
+mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases -P apache-releases \
-Durl=$M2_REPOSITORY \
-Dfile=poi-@VERSION@-@DSTAMP@.jar -DpomFile=poi-@VERSION@.pom
-mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases \
+scp poi-@VERSION@.pom.asc $M2_SCP/org/apache/poi/poi/@VERSION@/
+
+mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases -P apache-releases \
-Durl=$M2_REPOSITORY \
-Dfile=poi-scratchpad-@VERSION@-@DSTAMP@.jar -DpomFile=poi-scratchpad-@VERSION@.pom
-mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases \
+scp poi-scratchpad-@VERSION@.pom.asc $M2_SCP/org/apache/poi/poi-scratchpad/@VERSION@/
+
+mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases -P apache-releases \
-Durl=$M2_REPOSITORY \
-Dfile=poi-contrib-@VERSION@-@DSTAMP@.jar -DpomFile=poi-contrib-@VERSION@.pom
-mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases \
+scp poi-contrib-@VERSION@.pom.asc $M2_SCP/org/apache/poi/poi-contrib/@VERSION@/
+
+mvn gpg:sign-and-deploy-file -DrepositoryId=apache-releases -P apache-releases \
-Durl=$M2_REPOSITORY \
-Dfile=poi-ooxml-@VERSION@-@DSTAMP@.jar -DpomFile=poi-ooxml-@VERSION@.pom
+scp poi-ooxml-@VERSION@.pom.asc $M2_SCP/org/apache/poi/poi-ooxml/@VERSION@/
diff --git a/src/documentation/release-guide.txt b/src/documentation/release-guide.txt
index 30b4b91e0..003c55c36 100755
--- a/src/documentation/release-guide.txt
+++ b/src/documentation/release-guide.txt
@@ -78,12 +78,8 @@ poi-src-$TAG-$DATE.zip
{code}
where $TAG is the release tag specified in build.xml in the version.id property, $DATE is the release date (typically +7 days from the actual build date).
- 7. Build Mavn POM files
-{code}
-ant maven-dist
-{code}
- 8. Signing the release artifacts:
+ 7. Signing the release artifacts:
{code}
cd build/dist
for i in *.zip ; do
@@ -100,7 +96,7 @@ Verify the signatures:
gpg --multifile --verify *.asc
{code}
- 9. Create MD5 checksums for all artifacts to be published:
+ 8. Create MD5 checksums for all artifacts to be published:
{code}
for i in *.zip ; do
@@ -111,7 +107,7 @@ for i in *.gz ; do
done
{code}
- 10. Upload to your area at people.apache.org.
+ 9. Upload to your area at people.apache.org.
There should be two directories:
main
maven
@@ -143,10 +139,10 @@ cp *-src-* /www/www.apache.org/dist/poi/release/src
cp *-bin-* /www/www.apache.org/dist/poi/release/bin
{code}
+copy Maven artifacts
{code}
-cd ~/POI-3.1-BETA1/maven
-cp -r org.apache.poi /www/people.apache.org/repo/m1-ibiblio-rsync-repository/
-cp -r poi/poms /www/people.apache.org/repo/m1-ibiblio-rsync-repository/poi
+cd build/dist
+./mvn-deploy.sh
{code}
2. Make sure that the files are owned by the unix group apcvs and that they are writable by this group.