From 39312a7a5441e7f75ab4c2eab99e53ca321c6601 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 8 Feb 2022 12:11:32 +1000 Subject: [PATCH 1/5] make java 11 as project base but keep javac release 8, we will be able to upgrade ecj and errorprone Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 2 +- pom.xml | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 766e12cb..b87ea8ff 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,7 +29,7 @@ jobs: name: Build it uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1 with: - jdk-matrix: '["8", "11", "17"]' + jdk-matrix: '["11", "17"]' jdk-distribution-matrix: '["zulu", "temurin"]' os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' diff --git a/pom.xml b/pom.xml index 0ef6d1e1..a27fbd45 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ scm:git:git@github.com:codehaus-plexus/plexus-compiler.git - 8 + 11 true 2021-10-18T08:22:06Z 5.8.2 @@ -121,6 +121,13 @@ ${redirectTestOutputToFile} + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + + org.apache.maven.plugins maven-release-plugin @@ -192,7 +199,7 @@ - [1.8,) + [11,) [ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 8 or newer From aa42be24e8e12c112c1b5151f10acd56d099e872 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 8 Feb 2022 13:44:52 +1000 Subject: [PATCH 2/5] jdk fast fail to 11 Signed-off-by: Olivier Lamy --- .github/workflows/maven.yml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b87ea8ff..c48b7fdf 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -29,6 +29,7 @@ jobs: name: Build it uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1 with: + jdk-fast-fail-build: '11' jdk-matrix: '["11", "17"]' jdk-distribution-matrix: '["zulu", "temurin"]' os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' diff --git a/pom.xml b/pom.xml index a27fbd45..bdaacd3a 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ [11,) - [ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 8 or newer + [ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 11 or newer From 60f4e9319968bb7b5cc7fccffe602406cfc7b523 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 8 Feb 2022 14:02:00 +1000 Subject: [PATCH 3/5] more jdk 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 c48b7fdf..5f41ad5b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -31,7 +31,7 @@ jobs: with: jdk-fast-fail-build: '11' jdk-matrix: '["11", "17"]' - jdk-distribution-matrix: '["zulu", "temurin"]' + jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica"]' os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' From 562018fa56e2c9879495d5241c1bbb1169c88da5 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 8 Feb 2022 14:02:47 +1000 Subject: [PATCH 4/5] user correct version 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 5f41ad5b..1111ccc4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -27,7 +27,7 @@ jobs: build: name: Build it - uses: codehaus-plexus/.github/.github/workflows/maven.yml@v0.0.1 + uses: codehaus-plexus/.github/.github/workflows/maven.yml@master with: jdk-fast-fail-build: '11' jdk-matrix: '["11", "17"]' From 299a49e430ba6093e8a204ce347fbc8c12aea612 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 8 Feb 2022 14:06:54 +1000 Subject: [PATCH 5/5] touch Signed-off-by: Olivier Lamy --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index bdaacd3a..9cc2aa04 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,6 @@ ${scm.url} ${scm.url} http://github.com/codehaus-plexus/plexus-compiler/tree/${project.scm.tag}/ - master github