From 2214baf0721ac457613c93e203b0801f2ad9e7cf Mon Sep 17 00:00:00 2001
From: Symious <yiyang0203@gmail.com>
Date: Mon, 8 Sep 2025 16:00:27 +0800
Subject: [PATCH 1/6] HDDS-13656. Fix aspectj under JDK9+ compilation

---
 hadoop-ozone/ozone-manager/pom.xml | 13 ++++++++++---
 pom.xml                            |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 6347ee2722bf..f39714776ead 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -453,17 +453,24 @@
         <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>${maven.compiler.source}</source>
+          <target>${maven.compiler.target}</target>
           <argumentFileDirectory>${project.build.directory}/aspectj-build</argumentFileDirectory>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjtools</artifactId>
+            <version>${aspectj.version}</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <goals>
               <goal>compile</goal>
             </goals>
             <configuration>
-              <complianceLevel>1.8</complianceLevel>
+              <complianceLevel>${maven.compiler.source}</complianceLevel>
             </configuration>
           </execution>
         </executions>
diff --git a/pom.xml b/pom.xml
index 9d2ca2aa4286..85a1578d8439 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
     <aopalliance.version>1.0</aopalliance.version>
     <apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
     <aspectj-plugin.version>1.14.1</aspectj-plugin.version>
+    <aspectj.java9.version>1.9.24</aspectj.java9.version>
     <aspectj.version>1.9.7</aspectj.version>
     <assertj.version>3.27.4</assertj.version>
     <aws-java-sdk.version>1.12.788</aws-java-sdk.version>
@@ -2688,7 +2689,10 @@
       </activation>
       <properties>
         <!-- supported since Java 9 -->
+        <aspectj.version>${aspectj.java9.version}</aspectj.version>
         <maven.compiler.release>${javac.version}</maven.compiler.release>
+        <maven.compiler.source>${javac.version}</maven.compiler.source>
+        <maven.compiler.target>${javac.version}</maven.compiler.target>
       </properties>
     </profile>
     <profile>

From e2fcc1d370e1aece3c3b5bbec3e30f4ce30d1654 Mon Sep 17 00:00:00 2001
From: Symious <yiyang0203@gmail.com>
Date: Mon, 8 Sep 2025 17:14:18 +0800
Subject: [PATCH 2/6] HDDS-13656. Fix aspectj for jdk11

---
 pom.xml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 85a1578d8439..7ab12723434b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,8 @@
     <aopalliance.version>1.0</aopalliance.version>
     <apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
     <aspectj-plugin.version>1.14.1</aspectj-plugin.version>
-    <aspectj.java9.version>1.9.24</aspectj.java9.version>
+    <aspectj.java11.version>1.9.20</aspectj.java11.version>
+    <aspectj.java21.version>1.9.24</aspectj.java21.version>
     <aspectj.version>1.9.7</aspectj.version>
     <assertj.version>3.27.4</assertj.version>
     <aws-java-sdk.version>1.12.788</aws-java-sdk.version>
@@ -2683,13 +2684,24 @@
       </properties>
     </profile>
     <profile>
-      <id>java9-or-later</id>
+      <id>java11-20</id>
+      <activation><jdk>[11,20]</jdk></activation>
+      <properties>
+        <aspectj.version>${aspectj.java11.version}</aspectj.version>
+        <!-- supported since Java 9 -->
+        <maven.compiler.release>${javac.version}</maven.compiler.release>
+        <maven.compiler.source>${javac.version}</maven.compiler.source>
+        <maven.compiler.target>${javac.version}</maven.compiler.target>
+      </properties>
+    </profile>
+    <profile>
+      <id>java21-or-later</id>
       <activation>
-        <jdk>[9,]</jdk>
+        <jdk>[21,]</jdk>
       </activation>
       <properties>
+        <aspectj.version>${aspectj.java21.version}</aspectj.version>
         <!-- supported since Java 9 -->
-        <aspectj.version>${aspectj.java9.version}</aspectj.version>
         <maven.compiler.release>${javac.version}</maven.compiler.release>
         <maven.compiler.source>${javac.version}</maven.compiler.source>
         <maven.compiler.target>${javac.version}</maven.compiler.target>

From 3c11fca8ba1b5ca21fd6fe4d2b549f4153b63d16 Mon Sep 17 00:00:00 2001
From: Symious <yiyang0203@gmail.com>
Date: Mon, 8 Sep 2025 17:21:54 +0800
Subject: [PATCH 3/6] HDDS-13656. Sort the pom

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7ab12723434b..f20356713394 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2685,7 +2685,9 @@
     </profile>
     <profile>
       <id>java11-20</id>
-      <activation><jdk>[11,20]</jdk></activation>
+      <activation>
+        <jdk>[11,20]</jdk>
+      </activation>
       <properties>
         <aspectj.version>${aspectj.java11.version}</aspectj.version>
         <!-- supported since Java 9 -->

From b7df320810c0d01d3bab4f6299b464a2ada44507 Mon Sep 17 00:00:00 2001
From: Symious <yiyang0203@gmail.com>
Date: Tue, 9 Sep 2025 17:04:21 +0800
Subject: [PATCH 4/6] HDDS-13656. Refactor the profile

---
 pom.xml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index f20356713394..dd172661301a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,8 @@
     <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
     <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
     <maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
+    <maven.compiler.source>${javac.version}</maven.compiler.source>
+    <maven.compiler.target>${javac.version}</maven.compiler.target>
     <maven.core.version>3.9.10</maven.core.version>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <metainf-services.version>1.11</metainf-services.version>
@@ -2674,39 +2676,32 @@
     </profile>
     <!-- Profiles for specific JDK versions -->
     <profile>
-      <id>java8</id>
+      <id>java9-or-later</id>
       <activation>
-        <jdk>[,8]</jdk>
+        <jdk>[9,]</jdk>
       </activation>
       <properties>
-        <maven.compiler.source>${javac.version}</maven.compiler.source>
-        <maven.compiler.target>${javac.version}</maven.compiler.target>
+        <!-- supported since Java 9 -->
+        <maven.compiler.release>${javac.version}</maven.compiler.release>
       </properties>
     </profile>
+    <!-- Profiles for specific aspectj versions -->
     <profile>
-      <id>java11-20</id>
+      <id>aspectj-java11-20</id>
       <activation>
         <jdk>[11,20]</jdk>
       </activation>
       <properties>
         <aspectj.version>${aspectj.java11.version}</aspectj.version>
-        <!-- supported since Java 9 -->
-        <maven.compiler.release>${javac.version}</maven.compiler.release>
-        <maven.compiler.source>${javac.version}</maven.compiler.source>
-        <maven.compiler.target>${javac.version}</maven.compiler.target>
       </properties>
     </profile>
     <profile>
-      <id>java21-or-later</id>
+      <id>aspectj-java21-or-later</id>
       <activation>
         <jdk>[21,]</jdk>
       </activation>
       <properties>
         <aspectj.version>${aspectj.java21.version}</aspectj.version>
-        <!-- supported since Java 9 -->
-        <maven.compiler.release>${javac.version}</maven.compiler.release>
-        <maven.compiler.source>${javac.version}</maven.compiler.source>
-        <maven.compiler.target>${javac.version}</maven.compiler.target>
       </properties>
     </profile>
     <profile>

From c54cba173e4c703978cd0a02c9c5e4909de3d425 Mon Sep 17 00:00:00 2001
From: Symious <yiyang0203@gmail.com>
Date: Wed, 10 Sep 2025 15:43:22 +0800
Subject: [PATCH 5/6] HDDS-13656. Use release

---
 hadoop-ozone/ozone-manager/pom.xml | 6 +++---
 pom.xml                            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index f39714776ead..d9f7e7ed03b8 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -453,8 +453,8 @@
         <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
         <configuration>
-          <source>${maven.compiler.source}</source>
-          <target>${maven.compiler.target}</target>
+          <source>${maven.compiler.release}</source>
+          <target>${maven.compiler.release}</target>
           <argumentFileDirectory>${project.build.directory}/aspectj-build</argumentFileDirectory>
         </configuration>
         <dependencies>
@@ -470,7 +470,7 @@
               <goal>compile</goal>
             </goals>
             <configuration>
-              <complianceLevel>${maven.compiler.source}</complianceLevel>
+              <complianceLevel>${maven.compiler.release}</complianceLevel>
             </configuration>
           </execution>
         </executions>
diff --git a/pom.xml b/pom.xml
index dd172661301a..bb5759fa3c76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
     <aspectj-plugin.version>1.14.1</aspectj-plugin.version>
     <aspectj.java11.version>1.9.20</aspectj.java11.version>
     <aspectj.java21.version>1.9.24</aspectj.java21.version>
+    <!-- Default aspectj version for java8 -->
     <aspectj.version>1.9.7</aspectj.version>
     <assertj.version>3.27.4</assertj.version>
     <aws-java-sdk.version>1.12.788</aws-java-sdk.version>
@@ -164,8 +165,7 @@
     <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
     <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
     <maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
-    <maven.compiler.source>${javac.version}</maven.compiler.source>
-    <maven.compiler.target>${javac.version}</maven.compiler.target>
+    <maven.compiler.release>${javac.version}</maven.compiler.release>
     <maven.core.version>3.9.10</maven.core.version>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <metainf-services.version>1.11</metainf-services.version>

From f82e15d15962f51b4b741ab51bb07cb8ca422816 Mon Sep 17 00:00:00 2001
From: Symious <yiyang0203@gmail.com>
Date: Fri, 12 Sep 2025 10:40:57 +0800
Subject: [PATCH 6/6] Remove jdk9-or-later profile

---
 pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb5759fa3c76..68cfab5f50f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2674,17 +2674,6 @@
         </plugins>
       </build>
     </profile>
-    <!-- Profiles for specific JDK versions -->
-    <profile>
-      <id>java9-or-later</id>
-      <activation>
-        <jdk>[9,]</jdk>
-      </activation>
-      <properties>
-        <!-- supported since Java 9 -->
-        <maven.compiler.release>${javac.version}</maven.compiler.release>
-      </properties>
-    </profile>
     <!-- Profiles for specific aspectj versions -->
     <profile>
       <id>aspectj-java11-20</id>