From 30f3a801ef547fa83cbf4799ec43513a74aea38b Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <6454655+adoroszlai@users.noreply.github.com>
Date: Wed, 23 Oct 2024 21:43:05 +0200
Subject: [PATCH] HDDS-11600. Intermittent failure in repro due to ordering
 differences in builddef.lst (#7342)

(cherry picked from commit 35b6a3aa9468adf7d2f101dd901a4a90d4da8551)
---
 hadoop-ozone/ozone-manager/pom.xml | 3 ++-
 pom.xml                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 7ccca37c8047..ecfd074c40b2 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -474,12 +474,13 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>dev.aspectj</groupId>
         <artifactId>aspectj-maven-plugin</artifactId>
         <version>${aspectj-plugin.version}</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
+          <argumentFileDirectory>${project.build.directory}/aspectj-build</argumentFileDirectory>
         </configuration>
         <executions>
           <execution>
diff --git a/pom.xml b/pom.xml
index 224d5aecd6b0..db4581a4b816 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <sonar.java.binaries>${basedir}/target/classes</sonar.java.binaries>
 
     <aspectj.version>1.9.7</aspectj.version>
-    <aspectj-plugin.version>1.15.0</aspectj-plugin.version>
+    <aspectj-plugin.version>1.14</aspectj-plugin.version>
     <restrict-imports.enforcer.version>2.6.0</restrict-imports.enforcer.version>
     <jgrapht.version>1.4.0</jgrapht.version>
     <jgraphx.version>3.9.12</jgraphx.version>