Fix release buildspecs.

Author: millems

buildspecs/integ-test.yml

@@ -3,7 +3,7 @@ version: 0.2
 phases:
   build:
     commands:
-      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 -Dmaven.wagon.httpconnectionManager.maxPerRoute=2
+      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 -Dmaven.wagon.httpconnectionManager.maxPerRoute=2
       - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
       - echo $JAVA_VERSION
       - |

buildspecs/release-to-github.yml

@@ -5,15 +5,18 @@ phases:
     commands:
     - git config --global user.name "AWS"
     - git config --global user.email "<>"
+    - 'STAGING_REPOSITORY_URL="https://[email protected]/$STAGING_REPOSITORY.git"'
     - 'PUBLIC_REPOSITORY_URL="https://[email protected]/aws/aws-sdk-java-v2.git"'
 
   build:
     commands:
-    - git checkout release
+    - mkdir release
+    - cd release
+    -
+    - git clone -o staging -b release $STAGING_REPOSITORY_URL .
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
     -
     - git remote add --fetch public $PUBLIC_REPOSITORY_URL
-
     - git tag -a $RELEASE_VERSION -m "AWS SDK for Java v2 ($RELEASE_VERSION)"
     -
     - git push public HEAD:release

buildspecs/release-to-maven.yml

@@ -7,12 +7,13 @@ phases:
 
   pre_build:
     commands:
-    - TMP='tmp_settings'
-
+    - ROOT=`pwd`
+    - CREDENTIALS=$ROOT/credentials
+    - SETTINGS_XML=$CREDENTIALS/settings.xml
+    - GPG_HOME=$CREDENTIALS/gpghome
   build:
     commands:
-    - mkdir -p $TMP
-    - aws s3 cp s3://aws-java-sdk-credentials/settings.xml $TMP/settings.xml
+    - mkdir -p $CREDENTIALS
+    - aws s3 cp s3://aws-java-sdk-release-credentials/ $CREDENTIALS/ --recursive
     -
-    - mvn clean deploy -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -s $TMP/settings.xml -Ddoclint=none -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests
-    - mvn org.sonatype.plugins:nexus-staging-maven-plugin:release -Ppublishing -s $TMP/settings.xml
+    - mvn clean deploy -Ppublishing -DperformRelease -Dspotbugs.skip -DskipTests -Dcheckstyle.skip -Ddoclint=none -pl !:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests -DautoReleaseAfterClose=true -DstagingProgressTimeoutMinutes=30

buildspecs/update-master-from-release.yml

@@ -12,21 +12,23 @@ phases:
     - mkdir release
     - cd release
     -
-    - git clone -o public -b release $PUBLIC_REPOSITORY_URL
+    - git clone -o public -b release $PUBLIC_REPOSITORY_URL .
     -
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
-    - echo "Release version: $RELEASE_VERSION"
+    - echo "Release version - $RELEASE_VERSION"
     -
     - MAJOR=$(echo $RELEASE_VERSION | cut -d'.' -f1)
     - MINOR=$(echo $RELEASE_VERSION | cut -d'.' -f2)
     - POINT=$(echo $RELEASE_VERSION | cut -d'.' -f3)
     - NEW_VERSION_SNAPSHOT="$MAJOR.$MINOR.$((POINT + 1))-SNAPSHOT"
-    - echo "New shapshot version: $NEW_VERSION_SNAPSHOT"
+    - echo "New shapshot version - $NEW_VERSION_SNAPSHOT"
     -
     - git checkout master
-    - git merge origin/release --no-edit
+    - git merge public/release --no-edit
     -
     - mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
     - sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
     -
-    - git commit -am "Update to next snapshot version: $NEXT_VERSION_SNAPSHOT"
+    - 'git commit -am "Update to next snapshot version: $NEXT_VERSION_SNAPSHOT"'
+    -
+    - git push