Merge branch 'master' of [email protected]:MarcMazas/plexus-compiler.git

Author: mmazas

plexus-compiler-its/pom.xml

@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>3.9.0</version>
+        <version>3.9.1</version>
         <executions>
           <execution>
             <id>integration-tests</id>

plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java

@@ -551,8 +551,8 @@ private static long versionStringToMajorMinor(String version) throws CompilerExc
                 .replaceFirst("[.]0$", "");
 
         switch (version) {
-                // Java 1.6 as a default source/target seems to make sense. Maven Compiler should set its own default
-                // anyway, so this probably never needs to be used. But not having a default feels bad, too.
+            // Java 1.6 as a default source/target seems to make sense. Maven Compiler should set its own default
+            // anyway, so this probably never needs to be used. But not having a default feels bad, too.
             case "":
                 return ClassFileConstants.JDK1_6;
             case "1":

plexus-compilers/plexus-compiler-eclipse/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>ecj</artifactId>
-      <version>3.41.0</version>
+      <version>3.42.0</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java

@@ -27,8 +27,7 @@ public class JavaxToolsCompilerTest extends AbstractJavacCompilerTest {
     @Override
     protected int expectedWarnings() {
         String javaVersion = getJavaVersion();
-        if (javaVersion.contains("21")
-                || javaVersion.contains("24")) {
+        if (javaVersion.contains("21") || javaVersion.contains("24")) {
             return 1;
         } else {
             return super.expectedWarnings();

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus</artifactId>
-    <version>20</version>
+    <version>22</version>
   </parent>
 
   <artifactId>plexus-compiler</artifactId>
@@ -49,7 +49,7 @@
     <mavenVersion>3.6.3</mavenVersion>
     <minimalMavenBuildVersion>${mavenVersion}</minimalMavenBuildVersion>
     <errorprone.version>2.37.0</errorprone.version>
-    <eclipse.sisu.version>0.9.0.M3</eclipse.sisu.version>
+    <eclipse.sisu.version>0.9.0.M4</eclipse.sisu.version>
     <sisuMavenPluginVersion>${eclipse.sisu.version}</sisuMavenPluginVersion>
     <trimStackTrace>false</trimStackTrace>
     <preparationGoals>clean install</preparationGoals>
@@ -118,7 +118,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>33.4.6-jre</version>
+        <version>33.4.8-jre</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.sisu</groupId>