From c10a404f57152bccaf50d097712f50700147e58f Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Mon, 20 Nov 2023 10:58:10 +0000
Subject: [PATCH] [JAVA-26734] Upgraded aspectjrt, aspectjweaver to latest
 version (#15140)

---
 .../core-java-concurrency-advanced-3/pom.xml         |  6 +++---
 core-java-modules/core-java-os/pom.xml               |  1 -
 .../core-java-time-measurements/pom.xml              |  4 ++--
 di-modules/cdi/pom.xml                               |  2 +-
 libraries-3/pom.xml                                  |  6 +++---
 parent-boot-2/pom.xml                                | 12 +++++++++++-
 spring-boot-modules/spring-boot-annotations/pom.xml  |  1 -
 spring-boot-modules/spring-boot-mvc/pom.xml          |  3 +--
 spring-di/pom.xml                                    |  2 +-
 spring-static-resources/pom.xml                      |  4 ++--
 10 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/core-java-modules/core-java-concurrency-advanced-3/pom.xml b/core-java-modules/core-java-concurrency-advanced-3/pom.xml
index 7fa859c2d5..e3b399782e 100644
--- a/core-java-modules/core-java-concurrency-advanced-3/pom.xml
+++ b/core-java-modules/core-java-concurrency-advanced-3/pom.xml
@@ -85,12 +85,12 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <jcabi-aspects.version>0.22.6</jcabi-aspects.version>
-        <aspectjrt.version>1.9.5</aspectjrt.version>
+        <aspectjrt.version>1.9.20.1</aspectjrt.version>
         <cactoos.version>0.43</cactoos.version>
         <ea-async.version>1.2.3</ea-async.version>
         <jcabi-maven-plugin.version>0.14.1</jcabi-maven-plugin.version>
-        <aspectjtools.version>1.9.1</aspectjtools.version>
-        <aspectjweaver.version>1.9.1</aspectjweaver.version>
+        <aspectjtools.version>1.9.20.1</aspectjtools.version>
+        <aspectjweaver.version>1.9.20.1</aspectjweaver.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml
index d4ee34b8b7..cd5b479974 100644
--- a/core-java-modules/core-java-os/pom.xml
+++ b/core-java-modules/core-java-os/pom.xml
@@ -75,7 +75,6 @@
 
     <properties>
         <collections-generic.version>4.01</collections-generic.version>
-        <asspectj.version>1.8.9</asspectj.version>
         <maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
         <unix4j.version>0.4</unix4j.version>
diff --git a/core-java-modules/core-java-time-measurements/pom.xml b/core-java-modules/core-java-time-measurements/pom.xml
index 7b2bc31ebb..2dd713efe8 100644
--- a/core-java-modules/core-java-time-measurements/pom.xml
+++ b/core-java-modules/core-java-time-measurements/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>${asspectj.version}</version>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -74,7 +74,7 @@
     <properties>
         <commons-math3.version>3.6.1</commons-math3.version>
         <joda.version>2.10</joda.version>
-        <asspectj.version>1.8.9</asspectj.version>
+        <aspectj.version>1.9.20.1</aspectj.version>
         <jmockit.version>1.44</jmockit.version>
         <mockito-inline.version>4.1.0</mockito-inline.version>
     </properties>
diff --git a/di-modules/cdi/pom.xml b/di-modules/cdi/pom.xml
index fd920c8ce1..09f69f3dc3 100644
--- a/di-modules/cdi/pom.xml
+++ b/di-modules/cdi/pom.xml
@@ -59,7 +59,7 @@
     <properties>
         <cdi-api.version>2.0.SP1</cdi-api.version>
         <weld-se-core.version>3.1.6.Final</weld-se-core.version>
-        <aspectjweaver.version>1.9.19</aspectjweaver.version>
+        <aspectjweaver.version>1.9.20.1</aspectjweaver.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml
index 8d45b95a7b..9923e46267 100644
--- a/libraries-3/pom.xml
+++ b/libraries-3/pom.xml
@@ -219,10 +219,10 @@
         <airline.version>2.7.2</airline.version>
         <cache2k.version>1.2.3.Final</cache2k.version>
         <jcabi-aspects.version>0.22.6</jcabi-aspects.version>
-        <aspectjrt.version>1.9.2</aspectjrt.version>
+        <aspectjrt.version>1.9.20.1</aspectjrt.version>
         <jcabi-maven-plugin.version>0.14.1</jcabi-maven-plugin.version>
-        <aspectjtools.version>1.9.2</aspectjtools.version>
-        <aspectjweaver.version>1.9.2</aspectjweaver.version>
+        <aspectjtools.version>1.9.20.1</aspectjtools.version>
+        <aspectjweaver.version>1.9.20.1</aspectjweaver.version>
         <takes.version>1.19</takes.version>
         <httpcore.version>4.4.13</httpcore.version>
         <httpclient.version>4.5.12</httpclient.version>
diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index 3f6ad8ef8a..b79be81a66 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -36,6 +36,16 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjrt</artifactId>
+                <version>${aspectj.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjweaver</artifactId>
+                <version>${aspectj.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -95,7 +105,7 @@
         <!-- plugins -->
         <thin.version>1.0.22.RELEASE</thin.version>
         <spring-boot.version>2.7.11</spring-boot.version>
-        <aspectjweaver.version>1.9.1</aspectjweaver.version>
+        <aspectj.version>1.9.20.1</aspectj.version>
         <mysql-connector-java.version>8.0.31</mysql-connector-java.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-annotations/pom.xml b/spring-boot-modules/spring-boot-annotations/pom.xml
index 91f2614de8..13a28cbd4e 100644
--- a/spring-boot-modules/spring-boot-annotations/pom.xml
+++ b/spring-boot-modules/spring-boot-annotations/pom.xml
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>${aspectjweaver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-modules/spring-boot-mvc/pom.xml b/spring-boot-modules/spring-boot-mvc/pom.xml
index a251c5049b..963cda61b9 100644
--- a/spring-boot-modules/spring-boot-mvc/pom.xml
+++ b/spring-boot-modules/spring-boot-mvc/pom.xml
@@ -84,12 +84,10 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>${aspectjweaver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
-            <version>${aspectjweaver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -114,6 +112,7 @@
         <!-- ROME for RSS -->
         <rome.version>1.10.0</rome.version>
         <javax.faces.version>2.3.7</javax.faces.version>
+        <aspectj.version>1.9.20.1</aspectj.version>
         <start-class>com.baeldung.springbootmvc.SpringBootMvcApplication</start-class>
     </properties>
 
diff --git a/spring-di/pom.xml b/spring-di/pom.xml
index bae7263ef9..d073f5359d 100644
--- a/spring-di/pom.xml
+++ b/spring-di/pom.xml
@@ -134,7 +134,7 @@
         <start-class>org.baeldung.org.baeldung.sample.App</start-class>
         <!-- Spring -->
         <spring-boot.version>3.1.2</spring-boot.version>
-        <aspectjweaver.version>1.9.5</aspectjweaver.version>
+        <aspectjweaver.version>1.9.20.1</aspectjweaver.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-static-resources/pom.xml b/spring-static-resources/pom.xml
index 875b8de31b..2bf865ddbe 100644
--- a/spring-static-resources/pom.xml
+++ b/spring-static-resources/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>${org.aspectj-version}</version>
+            <version>${aspectj.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
@@ -186,7 +186,7 @@
     </build>
 
     <properties>
-        <org.aspectj-version>1.8.9</org.aspectj-version>
+        <aspectj.version>1.9.20.1</aspectj.version>
         <!-- various 1.3.2 -->
         <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
         <handlebars.version>4.1.0</handlebars.version>