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..65eb8b6e 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 @@ -107,9 +107,9 @@ - jdk16 + jdk11 - [16,) + [11,) diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml index 7f2bb65b..eff410dc 100644 --- a/plexus-compilers/plexus-compiler-eclipse/pom.xml +++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml @@ -25,7 +25,8 @@ org.eclipse.jdt ecj - 3.32.0 + + 3.26.0 org.codehaus.plexus diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml index ca567cdd..ca3a68c2 100644 --- a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml +++ b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml @@ -39,9 +39,9 @@ - 16+ + 11+ - [16,) + [11,) @@ -49,13 +49,18 @@ org.apache.maven.plugins maven-surefire-plugin - true - - - - - - + + --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..68b2ead9 100644 --- a/pom.xml +++ b/pom.xml @@ -49,9 +49,11 @@ true 2022-12-17T17:23:49Z 5.9.2 - 1.9.9.1 + + 1.9.7 3.2.5 - 2.18.0 + + 2.8.1 false clean install 3.11.0 @@ -197,6 +199,13 @@ org.apache.maven.plugins maven-enforcer-plugin 3.3.0 + + + org.codehaus.mojo + extra-enforcer-rules + 1.6.1 + + enforce-java @@ -212,6 +221,20 @@ + + enforce-bytecode-version + + enforce + + + + + ${maven.compiler.target} + + + true + +