From 72d0b48e39a743e6f8641431bd7b0ed4db20519b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 19 Jun 2022 19:45:07 +0000
Subject: [PATCH 1/2] Bump aspectj.version from 1.9.7.M3 to 1.9.9.1

Bumps `aspectj.version` from 1.9.7.M3 to 1.9.9.1.

Updates `aspectjrt` from 1.9.7.M3 to 1.9.9.1
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)

Updates `aspectjtools` from 1.9.7.M3 to 1.9.9.1
- [Release notes](https://github.com/eclipse/org.aspectj/releases)
- [Commits](https://github.com/eclipse/org.aspectj/commits)

---
updated-dependencies:
- dependency-name: org.aspectj:aspectjrt
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.aspectj:aspectjtools
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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 4c11a79a..cec63a21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
     <redirectTestOutputToFile>true</redirectTestOutputToFile>
     <project.build.outputTimestamp>2022-04-30T04:30:22Z</project.build.outputTimestamp>
     <jupiter.version>5.8.2</jupiter.version>
-    <aspectj.version>1.9.7</aspectj.version>
+    <aspectj.version>1.9.9.1</aspectj.version>
     <maven.version>3.2.5</maven.version>
     <errorprone.version>2.14.0</errorprone.version>
     <trimStackTrace>false</trimStackTrace>

From 7cb33b304d0e4b5c8786b71fd46f891994d78e97 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 25 Jun 2022 14:02:18 +0200
Subject: [PATCH 2/2] Avoid NPE in AspectJCompilerTest on AspectJ 1.9.8+

Due to changed Eclipse Compiler (JDT Core) upstream of AJC, we need to
call 'buildArgParser.populateBuildConfig(..)' in order to avoid an NPE
when AjBuildConfig.getCheckedClasspaths() is called later during
compilation.

Only the unit test (which is not really a unit test) is affected by this
problem, because it compiles in-process. The 'aspectj-compiler' IT was
still passing before this change.
---
 .../org/codehaus/plexus/compiler/ajc/AspectJCompiler.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 156e166e..83053d48 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
@@ -340,7 +340,10 @@ public AspectJMessagePrinter( boolean verbose )
     private AjBuildConfig buildCompilerConfig( CompilerConfiguration config )
         throws CompilerException
     {
-        AjBuildConfig buildConfig = new AjBuildConfig(new BuildArgParser(new AspectJMessagePrinter(config.isVerbose())));
+        BuildArgParser buildArgParser = new BuildArgParser(new AspectJMessagePrinter(config.isVerbose()));
+        AjBuildConfig buildConfig = new AjBuildConfig(buildArgParser);
+        // Avoid NPE when AjBuildConfig.getCheckedClasspaths() is called later during compilation
+        buildArgParser.populateBuildConfig(buildConfig, new String[0], true, null);
         buildConfig.setIncrementalMode( false );
 
         String[] files = getSourceFiles( config );