diff --git a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java b/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java index d3503d8b..35d059e8 100644 --- a/plexus-compilers/plexus-compiler-aspectj/src/main/java/org/codehaus/plexus/compiler/ajc/AspectJCompiler.java +++ b/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": diff --git a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java b/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java index d0221859..4aa9a88c 100644 --- a/plexus-compilers/plexus-compiler-javac/src/test/java/org/codehaus/plexus/compiler/javac/JavaxToolsCompilerTest.java +++ b/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(); diff --git a/pom.xml b/pom.xml index 9b1ae532..6c65f31e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 20 + 21 plexus-compiler