From cec2b0328e16e0783f06f63c5b2c33b2cfc8264f Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@gmail.com>
Date: Mon, 11 Dec 2023 10:12:12 +0100
Subject: [PATCH 1/2] Update AspectJ Compiler to 1.9.21 to support Java 21

---
 plexus-compilers/plexus-compiler-aspectj/pom.xml | 2 +-
 pom.xml                                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plexus-compilers/plexus-compiler-aspectj/pom.xml b/plexus-compilers/plexus-compiler-aspectj/pom.xml
index f1b9095f..b8697705 100644
--- a/plexus-compilers/plexus-compiler-aspectj/pom.xml
+++ b/plexus-compilers/plexus-compiler-aspectj/pom.xml
@@ -14,7 +14,7 @@
   <description>AspectJ Compiler support for Plexus Compiler component.</description>
 
   <properties>
-    <javaVersion>11</javaVersion>
+    <javaVersion>17</javaVersion>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index bb29460c..530677fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
     <redirectTestOutputToFile>true</redirectTestOutputToFile>
     <project.build.outputTimestamp>2022-12-17T17:23:49Z</project.build.outputTimestamp>
     <jupiter.version>5.10.1</jupiter.version>
-    <aspectj.version>1.9.19</aspectj.version>
+    <aspectj.version>1.9.21</aspectj.version>
     <maven.version>3.5.4</maven.version>
     <errorprone.version>2.23.0</errorprone.version>
     <trimStackTrace>false</trimStackTrace>

From 3254992deea7ea69dfe15b96fb7c932eb8805bdc Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@gmail.com>
Date: Mon, 11 Dec 2023 10:46:48 +0100
Subject: [PATCH 2/2] Injecting beans compiled for Java 17 works only with
 Maven 3.9.6+ thanks to Eclipse Sisu update

---
 .../src/main/it/aspectj-compiler/invoker.properties              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plexus-compiler-its/src/main/it/aspectj-compiler/invoker.properties b/plexus-compiler-its/src/main/it/aspectj-compiler/invoker.properties
index 94a712db..fdaa6fb0 100644
--- a/plexus-compiler-its/src/main/it/aspectj-compiler/invoker.properties
+++ b/plexus-compiler-its/src/main/it/aspectj-compiler/invoker.properties
@@ -15,5 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
+invoker.maven.version = 3.9.6+
 invoker.goals = clean test
 #invoker.buildResult = failure