From b442deed02f1976eca596d69d5dcc9c1a92f3c1a Mon Sep 17 00:00:00 2001 From: hcoles Date: Sun, 15 Dec 2019 11:13:37 +0000 Subject: [PATCH 1/5] update verification projects to java 7 minimum --- .../src/test/resources/pit-158-coverage/pom.xml | 4 ++-- .../src/test/resources/pit-183-gwtmockito/pom.xml | 4 ++-- .../src/test/resources/pit-263-yatspec/pom.xml | 4 ++-- .../src/test/resources/pit-33-setUserDir/pom.xml | 6 +++--- .../src/test/resources/pit-deterministic-coverage/pom.xml | 4 ++-- .../src/test/resources/pit-junit-categories/pom.xml | 4 ++-- .../src/test/resources/pit-process-hang/pom.xml | 4 ++-- .../src/test/resources/pit-site-combined/pom.xml | 4 ++-- .../src/test/resources/pit-site-custom-config/pom.xml | 4 ++-- .../test/resources/pit-site-multiple-timestamped/pom.xml | 4 ++-- .../src/test/resources/pit-site-non-timestamped/pom.xml | 4 ++-- .../src/test/resources/pit-sub-module/pom.xml | 6 +++--- .../src/test/resources/pit-surefire-excludes/pom.xml | 4 ++-- .../src/test/resources/pit-testng-jmockit/pom.xml | 4 ++-- .../src/test/resources/pit-testng/pom.xml | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml b/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml index d8e16a30c..c6e1912e7 100644 --- a/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml @@ -33,8 +33,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml b/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml index a864c13c4..dde41da86 100644 --- a/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml @@ -16,8 +16,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml b/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml index 305b1597c..fbd2f0755 100644 --- a/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml @@ -13,8 +13,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml b/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml index d41142d05..69a28a7bc 100644 --- a/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml @@ -20,8 +20,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 @@ -44,4 +44,4 @@ pit-33-setUserDir-subModule - \ No newline at end of file + diff --git a/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml b/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml index 5bcc649d3..ca60c0566 100644 --- a/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml @@ -20,8 +20,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml b/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml index fba814adc..9938e8d09 100644 --- a/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml @@ -21,8 +21,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml b/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml index f574abc65..9ca5801f3 100644 --- a/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml @@ -28,8 +28,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml index e73081af9..591656b69 100644 --- a/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-site-combined/pom.xml @@ -23,8 +23,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml index 36d88e05e..34d256fda 100644 --- a/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-site-custom-config/pom.xml @@ -23,8 +23,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml index 369f4be3f..7e1baa189 100644 --- a/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-site-multiple-timestamped/pom.xml @@ -23,8 +23,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml index 5b60dd0e4..6922abea7 100644 --- a/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-site-non-timestamped/pom.xml @@ -23,8 +23,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml index 809860853..a6d2db655 100644 --- a/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml @@ -20,8 +20,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 @@ -55,4 +55,4 @@ sub-module-1 sub-module-2 - \ No newline at end of file + diff --git a/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml b/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml index dc40a0b33..febdb9941 100644 --- a/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml @@ -21,8 +21,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-testng-jmockit/pom.xml b/pitest-maven-verification/src/test/resources/pit-testng-jmockit/pom.xml index 5afa36cff..ce63d26a1 100644 --- a/pitest-maven-verification/src/test/resources/pit-testng-jmockit/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-testng-jmockit/pom.xml @@ -34,8 +34,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/pitest-maven-verification/src/test/resources/pit-testng/pom.xml b/pitest-maven-verification/src/test/resources/pit-testng/pom.xml index 606b269b3..c964ac2d8 100644 --- a/pitest-maven-verification/src/test/resources/pit-testng/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-testng/pom.xml @@ -21,8 +21,8 @@ maven-compiler-plugin 2.4 - 1.6 - 1.6 + 1.7 + 1.7 From 34bbb2f6f692deb9b60dca1be79d326d67410949 Mon Sep 17 00:00:00 2001 From: hcoles Date: Sun, 15 Dec 2019 12:34:39 +0000 Subject: [PATCH 2/5] update verification projects to java 7 minimum --- .../src/test/resources/pit-sub-module/sub-module-1/pom.xml | 6 +++--- .../src/test/resources/pit-sub-module/sub-module-2/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml index 95c665a66..845f89a4f 100644 --- a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml @@ -24,8 +24,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 @@ -34,4 +34,4 @@ 4.8.1 - \ No newline at end of file + diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml index a04f612e8..92d6e17b5 100644 --- a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml @@ -24,8 +24,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 @@ -34,4 +34,4 @@ 4.8.1 - \ No newline at end of file + From 883ca8321ad832c6cfd2cead8fe8c87672fcd577 Mon Sep 17 00:00:00 2001 From: hcoles Date: Sun, 15 Dec 2019 20:50:05 +0000 Subject: [PATCH 3/5] bump version of gwtmockito --- .../src/test/resources/pit-183-gwtmockito/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml b/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml index dde41da86..7dc23f19b 100644 --- a/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-183-gwtmockito/pom.xml @@ -3,7 +3,7 @@ com.google.gwt.gwtmockito gwtmockito-parent - 1.1.5 + 1.1.9 sample @@ -51,6 +51,7 @@ org.mockito mockito-all + 1.10.19 test From d467d515375ac6e880f2130bbb5b39cfc294930b Mon Sep 17 00:00:00 2001 From: hcoles Date: Sun, 15 Dec 2019 21:08:09 +0000 Subject: [PATCH 4/5] do not allow build to fail on 12 --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cded9eb7f..7d4d87771 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,13 +30,11 @@ matrix: - jdk: openjdk12 env: MAVEN=3.5.4 - - env: JDK='OpenJ9 11' MAVEN=3.5.4 - install: . ./install-jdk.sh --url "https://api.adoptopenjdk.net/v2/binary/releases/openjdk11?openjdk_impl=openj9&os=linux&arch=x64&release=latest&type=jdk&heap_size=normal" - - # Java 12 build fails - allow_failures: - jdk: openjdk12 env: MAVEN=3.5.4 + + - env: JDK='OpenJ9 11' MAVEN=3.5.4 + install: . ./install-jdk.sh --url "https://api.adoptopenjdk.net/v2/binary/releases/openjdk11?openjdk_impl=openj9&os=linux&arch=x64&release=latest&type=jdk&heap_size=normal" script: - wget $(echo -n $BASEURL | sed -e 's#VERSION#'$MAVEN'#g') From b804489115ab7fcc8f8606b5df058551ea4e6544 Mon Sep 17 00:00:00 2001 From: hcoles Date: Sun, 15 Dec 2019 21:21:30 +0000 Subject: [PATCH 5/5] remove duplicate java 12 build --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d4d87771..bb01a6f44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,6 @@ matrix: - jdk: openjdk11 env: MAVEN=3.5.4 - - jdk: openjdk12 - env: MAVEN=3.5.4 - - jdk: openjdk12 env: MAVEN=3.5.4