Remove codebuild hacks and move to the standard codebuild image.

Author: millems

buildspecs/benchmarks.yml

@@ -1,6 +1,10 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
   build:
     commands:
       - mvn install -P quick -pl :sdk-benchmarks --am

buildspecs/better-integ-test.yml

@@ -1,6 +1,10 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
   build:
     commands:
       - python scripts/run-integ-test

buildspecs/build.yml

@@ -1,9 +1,13 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
   build:
     commands:
-      - mvn clean install -D maven.wagon.httpconnectionManager.maxPerRoute=2
+      - mvn clean install -T1C
       - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
       - echo $JAVA_VERSION
       - |

buildspecs/integ-test.yml

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

buildspecs/on-demand-integ-test.yml

@@ -1,9 +1,13 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
   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 --fail-at-end
+      - mvn clean install -Dskip.unit.tests -P integration-tests -Dfindbugs.skip -Dcheckstyle.skip -pl !:dynamodbmapper-v1 -Dfailsafe.rerunFailingTestsCount=1 --fail-at-end
       - JAVA_VERSION=$(java -version 2>&1 | grep -i version | cut -d'"' -f2 | cut -d'.' -f1-1)
       - echo $JAVA_VERSION
       - |

buildspecs/release-javadoc.yml

@@ -2,6 +2,9 @@ version: 0.2
 
 phases:
   install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
     commands:
     - pip install awscli --upgrade --user
 
@@ -11,7 +14,7 @@ phases:
 
   build:
     commands:
-    - mvn install -P quick -D maven.wagon.httpconnectionManager.maxPerRoute=2 -T1C
+    - mvn install -P quick -T1C
     - mvn install javadoc:aggregate -B -Ppublic-javadoc -Dcheckstyle.skip -Dspotbugs.skip -DskipTests -Ddoclint=none -pl '!:dynamodbdocument-v1,!:dynamodbmapper-v1,!:protocol-tests,!:protocol-tests-core,!:codegen-generated-classes-test,!:sdk-benchmarks,!:module-path-tests,!:test-utils,!:http-client-tests,!:tests-coverage-reporting'
     - RELEASE_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
     -

buildspecs/release-to-github.yml

@@ -1,6 +1,10 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
   pre_build:
     commands:
     - git config --global user.name "AWS"

buildspecs/release-to-maven.yml

@@ -2,6 +2,9 @@ version: 0.2
 
 phases:
   install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
     commands:
     - pip install awscli --upgrade --user
 

buildspecs/update-master-from-release.yml

@@ -1,6 +1,10 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
   pre_build:
     commands:
     - git config --global user.name "AWS"

buildspecs/update-snapshot-version.yml

@@ -1,6 +1,10 @@
 version: 0.2
 
 phases:
+  install:
+    runtime-versions:
+      java: "$JAVA_RUNTIME"
+
   pre_build:
     commands:
     - git config --global user.name "AWS"

scripts/run-integ-test

@@ -61,7 +61,7 @@ def run_tests(modules):
     modules_to_include = modules_to_include[:-1]
 
     # build necessary dependencies first
-    check_call(["mvn", "clean", "install", "-pl", modules_to_include, "-P", "quick", "--am", "-Dmaven.wagon.httpconnectionManager.maxPerRoute=2"])
+    check_call(["mvn", "clean", "install", "-pl", modules_to_include, "-P", "quick", "--am"])
     check_call(["mvn", "verify", "-pl", modules_to_include, "-P", "integration-tests", "-Dfailsafe.rerunFailingTestsCount=1"])
 
 if __name__ == "__main__":