From a4ecc1ca290941074f87ad872d566bbaf1caa71d Mon Sep 17 00:00:00 2001
From: vunamtien <vunamtien16@gmail.com>
Date: Tue, 16 Apr 2024 13:26:58 +0700
Subject: [PATCH] [JAVA-31657] Upgrade-spring-aspects-to-latest-version
 (#16338)

---
 persistence-modules/spring-hibernate-5/pom.xml | 3 ++-
 persistence-modules/spring-hibernate-6/pom.xml | 3 ++-
 spring-aop-2/pom.xml                           | 4 ++++
 spring-core-2/pom.xml                          | 2 ++
 spring-di-2/pom.xml                            | 2 ++
 spring-scheduling/pom.xml                      | 2 ++
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/persistence-modules/spring-hibernate-5/pom.xml b/persistence-modules/spring-hibernate-5/pom.xml
index b6c8176f2f..a08771d26a 100644
--- a/persistence-modules/spring-hibernate-5/pom.xml
+++ b/persistence-modules/spring-hibernate-5/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${spring-aspects.version}</version>
         </dependency>
         <!-- persistence -->
         <dependency>
@@ -144,6 +144,7 @@
         <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
         <org.springframework.data.version>1.10.6.RELEASE</org.springframework.data.version>
         <org.springframework.security.version>4.2.1.RELEASE</org.springframework.security.version>
+        <spring-aspects.version>6.1.5</spring-aspects.version>
         <!-- persistence -->
         <hibernate.version>5.6.15.Final</hibernate.version>
         <hibernatesearch.version>5.11.12.Final</hibernatesearch.version>
diff --git a/persistence-modules/spring-hibernate-6/pom.xml b/persistence-modules/spring-hibernate-6/pom.xml
index e096fc421a..43610a4a9b 100644
--- a/persistence-modules/spring-hibernate-6/pom.xml
+++ b/persistence-modules/spring-hibernate-6/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${spring-aspects.version}</version>
         </dependency>
         <!-- persistence -->
         <dependency>
@@ -100,6 +100,7 @@
         <org.springframework.version>6.0.11</org.springframework.version>
         <org.springframework.data.version>3.1.3</org.springframework.data.version>
         <org.springframework.security.version>6.1.3</org.springframework.security.version>
+        <spring-aspects.version>6.1.5</spring-aspects.version>
         <!-- persistence -->
         <hibernate.version>6.4.2.Final</hibernate.version>
         <mysql-connector-java.version>8.2.0</mysql-connector-java.version>
diff --git a/spring-aop-2/pom.xml b/spring-aop-2/pom.xml
index 7aea3b64de..6c36ddc2ee 100644
--- a/spring-aop-2/pom.xml
+++ b/spring-aop-2/pom.xml
@@ -92,6 +92,7 @@
                 <dependency>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-aspects</artifactId>
+                    <version>${spring-aspects.version}</version>
                 </dependency>
             </dependencies>
             <build>
@@ -119,6 +120,7 @@
                                 <aspectLibrary>
                                     <groupId>org.springframework</groupId>
                                     <artifactId>spring-aspects</artifactId>
+                                    <version>${spring-aspects.version}</version>
                                 </aspectLibrary>
                             </aspectLibraries>
                         </configuration>
@@ -141,6 +143,7 @@
                 <dependency>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-aspects</artifactId>
+                    <version>${spring-aspects.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>org.springframework</groupId>
@@ -175,6 +178,7 @@
         <spring.version>5.3.27</spring.version>
         <start-class>com.baeldung.Application</start-class>
         <commons-rng-core.version>1.5</commons-rng-core.version>
+        <spring-aspects.version>6.1.5</spring-aspects.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index 5e40e20965..799524aa80 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -65,6 +65,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
+            <version>${spring-aspects.version}</version>
         </dependency>
         <!-- persistence -->
         <dependency>
@@ -135,6 +136,7 @@
     </build>
 
     <properties>
+        <spring-aspects.version>6.1.5</spring-aspects.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <servlet-api.version>4.0.0</servlet-api.version>
         <hibernate.version>6.2.5.Final</hibernate.version>
diff --git a/spring-di-2/pom.xml b/spring-di-2/pom.xml
index 6b4ecc6039..db0ffb4d1d 100644
--- a/spring-di-2/pom.xml
+++ b/spring-di-2/pom.xml
@@ -39,6 +39,7 @@
                         <aspectLibrary>
                             <groupId>org.springframework</groupId>
                             <artifactId>spring-aspects</artifactId>
+                            <version>${spring-aspects.version}</version>
                         </aspectLibrary>
                     </aspectLibraries>
                 </configuration>
@@ -56,6 +57,7 @@
     <properties>
         <aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
         <log4j2.version>2.17.1</log4j2.version>
+        <spring-aspects.version>6.1.5</spring-aspects.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-scheduling/pom.xml b/spring-scheduling/pom.xml
index e374b2b890..f2e622c9eb 100644
--- a/spring-scheduling/pom.xml
+++ b/spring-scheduling/pom.xml
@@ -28,6 +28,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
+            <version>${spring-aspects.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -46,6 +47,7 @@
 
     <properties>
         <spring-retry.version>2.0.3</spring-retry.version>
+        <spring-aspects.version>6.1.5</spring-aspects.version>
     </properties>
 
 </project>
\ No newline at end of file