Merge pull request #4442 from aws/zoewang/fixRelease

Fix release build failures

Author: zoewangg

buildspecs/build.yml

@@ -16,7 +16,6 @@ phases:
       - echo $MAVEN_OPTIONS
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
-          set -e
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P mock-tests

buildspecs/integ-test.yml

@@ -12,7 +12,6 @@ phases:
     commands:
       - |
         if [ ! -z "$INTEGRATION_TEST_ROLE_ARN" ]; then
-          set -e
           ASSUME_ROLE_OUTPUT=`aws sts assume-role --role-arn "$INTEGRATION_TEST_ROLE_ARN" --role-session-name "integration-tests" --duration-seconds 7200 --query 'Credentials.[AccessKeyId,SecretAccessKey,SessionToken]' --output text`
           AWS_ACCESS_KEY_ID=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $1 }'`
           AWS_SECRET_ACCESS_KEY=`echo $ASSUME_ROLE_OUTPUT | awk '{ print $2 }'`
@@ -25,7 +24,6 @@ phases:
       - echo $MAVEN_OPTIONS
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
-          set -e
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P integ-tests

buildspecs/on-demand-integ-test.yml

@@ -12,7 +12,6 @@ phases:
       - echo $JAVA_VERSION
       - |
         if [ "$JAVA_VERSION" -ge "9" ]; then
-          set -e
           cd test/module-path-tests
           mvn package
           mvn exec:exec -P integ-tests

buildspecs/release-to-maven-central.yml

@@ -24,7 +24,6 @@ phases:
       - ARTIFACT_URL="https://repo1.maven.org/maven2/software/amazon/awssdk/aws-sdk-java/$RELEASE_VERSION/"
       - |
         if ! curl -f --head $ARTIFACT_URL; then
-          set -e
           SONATYPE_USERNAME=`aws secretsmanager get-secret-value --secret-id $SONATYPE_USERNAME_ARN --query SecretString --output text`
           SONATYPE_PASSWORD=`aws secretsmanager get-secret-value --secret-id $SONATYPE_PASSWORD_ARN --query SecretString --output text`
           SDK_SIGNING_GPG_KEYNAME=`aws secretsmanager get-secret-value --secret-id $SDK_SIGNING_GPG_KEYNAME_ARN --query SecretString --output text`

buildspecs/release-to-maven.yml

@@ -24,7 +24,6 @@ phases:
       - SONATYPE_URL="https://aws.oss.sonatype.org/service/local/repositories/releases/content/software/amazon/awssdk/aws-sdk-java/$RELEASE_VERSION/"
       - |
         if ! curl -f --head $SONATYPE_URL; then
-          set -e
           SONATYPE_USERNAME=`aws secretsmanager get-secret-value --secret-id $SONATYPE_USERNAME_ARN --query SecretString --output text`
           SONATYPE_PASSWORD=`aws secretsmanager get-secret-value --secret-id $SONATYPE_PASSWORD_ARN --query SecretString --output text`
           SDK_SIGNING_GPG_KEYNAME=`aws secretsmanager get-secret-value --secret-id $SDK_SIGNING_GPG_KEYNAME_ARN --query SecretString --output text`

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/SdkPojoConversionUtilsTest.java

@@ -70,7 +70,9 @@ void toHeadObject_shouldCopyProperties() {
                                                                  "Key",
                                                                  "SSECustomerKeyMD5",
                                                                  "SSECustomerKey",
-                                                                 "SSECustomerAlgorithm"));
+                                                                 "SSECustomerAlgorithm",
+                                                                 "IfMatch",
+                                                                 "IfNoneMatch"));
         verifyFieldsAreCopied(randomCopyObject, convertedToHeadObject, fieldsToIgnore,
                               CopyObjectRequest.builder().sdkFields(),
                               HeadObjectRequest.builder().sdkFields());