From 790f431b7f1eea1608424a96459dbd28349fda0c Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 19 Apr 2021 07:31:53 +1000 Subject: [PATCH 1/6] add jdk distribution to the matrix Signed-off-by: olivier lamy --- .github/workflows/maven.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 52b712d8..f7ce8968 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -26,6 +26,7 @@ jobs: matrix: os: [ubuntu-latest,windows-latest, macOS-latest] java: [8, 11, 14, 15] + jdk: [adopt, zulu] fail-fast: false runs-on: ${{ matrix.os }} @@ -44,8 +45,9 @@ jobs: maven-${{ matrix.os }}- - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: ${{ matrix.jdk }} java-version: ${{ matrix.java }} - name: Build with Maven From bae19c07c3a2c45d4f993066f616a63a19059a09 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 19 Apr 2021 07:33:26 +1000 Subject: [PATCH 2/6] add jdk 16 Signed-off-by: olivier lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f7ce8968..e5c5bb49 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [ubuntu-latest,windows-latest, macOS-latest] - java: [8, 11, 14, 15] + java: [8, 11, 14, 15, 16] jdk: [adopt, zulu] fail-fast: false From 4980ed326bbf3a20d8bf22c654ff8354f0eb0daa Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 19 Apr 2021 07:37:42 +1000 Subject: [PATCH 3/6] add jdk 17-ea Signed-off-by: olivier lamy --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e5c5bb49..929b1bc4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: os: [ubuntu-latest,windows-latest, macOS-latest] - java: [8, 11, 14, 15, 16] + java: [8, 11, 14, 15, 16, 17-ea] jdk: [adopt, zulu] fail-fast: false From 341ae6d4891a1a6bea3e9dac445edba7d91cdd36 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 19 Apr 2021 08:19:44 +1000 Subject: [PATCH 4/6] error prone its not working on java16 Signed-off-by: olivier lamy --- .../src/main/it/error-prone-compiler/invoker.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties index 0ebe374a..a171aa0c 100644 --- a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties +++ b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.8+ +invoker.java.version = 1.8+, 16- invoker.goals = clean test-compile invoker.buildResult = failure From 755fd725cb81f906a833fdb559b77410312eaf85 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 19 Apr 2021 08:31:13 +1000 Subject: [PATCH 5/6] make this works with java 16 Signed-off-by: olivier lamy --- plexus-compiler-its/pom.xml | 3 ++ .../error-prone-compiler/invoker.properties | 2 +- .../src/main/it/error-prone-compiler/pom.xml | 43 ++++++++++++++++++- .../plexus-compiler-javac-errorprone/pom.xml | 2 +- pom.xml | 1 + 5 files changed, 48 insertions(+), 3 deletions(-) diff --git a/plexus-compiler-its/pom.xml b/plexus-compiler-its/pom.xml index e92f1756..2d9f97cf 100644 --- a/plexus-compiler-its/pom.xml +++ b/plexus-compiler-its/pom.xml @@ -49,6 +49,9 @@ clean test-compile + + ${errorprone.version} + diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties index a171aa0c..0ebe374a 100644 --- a/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties +++ b/plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. -invoker.java.version = 1.8+, 16- +invoker.java.version = 1.8+ invoker.goals = clean test-compile invoker.buildResult = failure diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml index dbbc85de..ae2a0b7b 100644 --- a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml +++ b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml @@ -59,7 +59,7 @@ com.google.errorprone error_prone_core - 2.4.0 + @errorprone.version@ @@ -87,5 +87,46 @@ + + jdk16 + + 16 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + UTF-8 + true + + -XDcompilePolicy=simple + -Xplugin:ErrorProne + -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED + -J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + -J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED + + + + com.google.errorprone + error_prone_core + @errorprone.version@ + + + + + + + diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml index c7bf73b2..0b7c02b1 100644 --- a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml +++ b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml @@ -29,7 +29,7 @@ com.google.errorprone error_prone_core - 2.4.0 + ${errorprone.version} org.codehaus.plexus diff --git a/pom.xml b/pom.xml index 2175fd03..3605183c 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,7 @@ 7 true 2020-08-24T00:30:49Z + 2.6.0 From e86474949bf9b3f04be61aaca9fc975be17fe81d Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Mon, 19 Apr 2021 08:35:18 +1000 Subject: [PATCH 6/6] use java range for profile Signed-off-by: olivier lamy --- plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml index ae2a0b7b..d3b0b37b 100644 --- a/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml +++ b/plexus-compiler-its/src/main/it/error-prone-compiler/pom.xml @@ -90,7 +90,7 @@ jdk16 - 16 + [16,)