From 9b7e8945cb2c4d27471ad35f5bf45d79f5ccce7f Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Wed, 18 Mar 2026 13:32:03 +0100
Subject: [PATCH 1/2] HDDS-14858. OM request fails with ClassNotFoundException:
 java.lang.constant.Constable

---
 hadoop-ozone/ozone-manager/pom.xml | 15 ---------------
 pom.xml                            | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index a4d34aca3af4..fae36afa538f 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -393,26 +393,11 @@
       <plugin>
         <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
-        <configuration>
-          <source>${maven.compiler.release}</source>
-          <target>${maven.compiler.release}</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>${maven.compiler.release}</complianceLevel>
-            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 68680cda280a..04a0bde3c6eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1674,6 +1674,17 @@
           <groupId>dev.aspectj</groupId>
           <artifactId>aspectj-maven-plugin</artifactId>
           <version>${aspectj-plugin.version}</version>
+          <configuration>
+            <complianceLevel>${maven.compiler.release}</complianceLevel>
+            <argumentFileDirectory>${project.build.directory}/aspectj-build</argumentFileDirectory>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>org.aspectj</groupId>
+              <artifactId>aspectjtools</artifactId>
+              <version>${aspectj.version}</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -2560,6 +2571,23 @@
         <aspectj.version>${aspectj.java21.version}</aspectj.version>
       </properties>
     </profile>
+    <profile>
+      <id>java9+</id>
+      <activation>
+        <jdk>[9,]</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>dev.aspectj</groupId>
+            <artifactId>aspectj-maven-plugin</artifactId>
+            <configuration>
+              <release>${maven.compiler.release}</release>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>go-offline</id>
       <properties>

From a4c1f5a166a12184047245b2eb34e52ffeef10c3 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Tue, 24 Mar 2026 06:32:00 +0100
Subject: [PATCH 2/2] set aspectj-maven-plugin --release only for Java 11+

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

diff --git a/pom.xml b/pom.xml
index 04a0bde3c6eb..74cd75a92e3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2572,9 +2572,9 @@
       </properties>
     </profile>
     <profile>
-      <id>java9+</id>
+      <id>java11+</id>
       <activation>
-        <jdk>[9,]</jdk>
+        <jdk>[11,]</jdk>
       </activation>
       <build>
         <plugins>