diff --git a/plexus-compiler-its/pom.xml b/plexus-compiler-its/pom.xml
index 5e3175fd..328e2261 100644
--- a/plexus-compiler-its/pom.xml
+++ b/plexus-compiler-its/pom.xml
@@ -12,9 +12,11 @@
pom
Plexus Compiler It Tests
-
+
4.13.2
+ 11
+ 11
true
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 bbdb70fb..1a63924f 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
@@ -51,11 +51,23 @@
maven-compiler-plugin
@maven.compiler.version@
- 8
- 8
+ 11
+ 11
+ 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
@@ -85,67 +97,4 @@
-
-
- jdk8
-
- 1.8
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
- true
-
- -J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar
-
-
-
-
-
-
-
- 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-aspectj/pom.xml b/plexus-compilers/plexus-compiler-aspectj/pom.xml
index f88d474e..2bf1e335 100644
--- a/plexus-compilers/plexus-compiler-aspectj/pom.xml
+++ b/plexus-compilers/plexus-compiler-aspectj/pom.xml
@@ -13,6 +13,11 @@
Plexus AspectJ Compiler
AspectJ Compiler support for Plexus Compiler component.
+
+ 11
+ 11
+
+
org.codehaus.plexus
diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml
index 7f2bb65b..dfa1f0d9 100644
--- a/plexus-compilers/plexus-compiler-eclipse/pom.xml
+++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml
@@ -13,6 +13,11 @@
Plexus Eclipse Compiler
Eclipse Compiler support for Plexus Compiler component.
+
+ 11
+ 11
+
+
org.codehaus.plexus
@@ -25,7 +30,7 @@
org.eclipse.jdt
ecj
- 3.32.0
+ 3.33.0
org.codehaus.plexus
@@ -53,26 +58,4 @@
-
-
- 1.7
-
- 1.7
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
-
-
-
-
-
diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml
index ca567cdd..0f292264 100644
--- a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml
+++ b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml
@@ -13,9 +13,14 @@
Plexus Javac+error-prone Component
Javac Compiler support for Plexus Compiler component,
with error-prone static analysis checks enabled.
- See http://errorprone.info
+ See https://errorprone.info
+
+ 11
+ 11
+
+
org.codehaus.plexus
@@ -37,30 +42,26 @@
-
-
- 16+
-
- [16,)
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+ --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+ --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+
+
+
+
+
diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
index aae3494f..242decfb 100644
--- a/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
+++ b/plexus-compilers/plexus-compiler-javac-errorprone/src/test/java/org/codehaus/plexus/compiler/javac/JavacErrorProneCompilerTest.java
@@ -9,10 +9,6 @@ public class JavacErrorProneCompilerTest
extends AbstractCompilerTest
{
- protected boolean java8() {
- return System.getProperty( "java.version" ).startsWith( "1.8" );
- }
-
@Override
protected String getRoleHint()
{
@@ -22,11 +18,13 @@ protected String getRoleHint()
@Override
protected int expectedWarnings()
{
- if ( java8() ) {
+ String javaVersion = getJavaVersion();
+ if (javaVersion.startsWith("1.8")) {
return 1;
- }
- else
- {
+ } else {
+ if (javaVersion.contains("18") || javaVersion.contains("19") || javaVersion.contains("20")) {
+ return 5;
+ }
return 2;
}
}
diff --git a/pom.xml b/pom.xml
index 9c55a16d..e398289e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
true
2022-12-17T17:23:49Z
5.9.2
- 1.9.9.1
+ 1.9.19
3.2.5
2.18.0
false
@@ -197,6 +197,13 @@
org.apache.maven.plugins
maven-enforcer-plugin
3.3.0
+
+
+ org.codehaus.mojo
+ extra-enforcer-rules
+ 1.6.1
+
+
enforce-java
@@ -212,6 +219,20 @@
+
+ enforce-bytecode-version
+
+ enforce
+
+
+
+
+ ${maven.compiler.target}
+
+
+ true
+
+