From 5f190ef018e3e8535121e155a5a20c669dfe9fac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 21:05:26 +0000
Subject: [PATCH 1/2] Bump org.codehaus.plexus:plexus from 20 to 21

Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 20 to 21.
- [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-pom/commits)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus
  dependency-version: '21'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b1ae532..6c65f31e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.codehaus.plexus</groupId>
     <artifactId>plexus</artifactId>
-    <version>20</version>
+    <version>21</version>
   </parent>
 
   <artifactId>plexus-compiler</artifactId>

From 19f3b2240e5ffeecdf2545c8a8a54b34097b399b Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Tue, 27 May 2025 20:34:50 +0200
Subject: [PATCH 2/2] fix spotless

---
 .../org/codehaus/plexus/compiler/ajc/AspectJCompiler.java     | 4 ++--
 .../plexus/compiler/javac/JavaxToolsCompilerTest.java         | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

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();