From 48d227544abb87fafe80ff2e9e3e0da51b567084 Mon Sep 17 00:00:00 2001
From: daniel-y <daniel@automq.com>
Date: Thu, 14 Sep 2023 19:21:43 +0800
Subject: [PATCH] chore(pom): move enforcer plugin to top pom.xml, and pass the
 compile

Signed-off-by: daniel-y <daniel@automq.com>
---
 controller/pom.xml | 18 -----------------
 pom.xml            | 49 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/controller/pom.xml b/controller/pom.xml
index d3ee4882d..715dc350f 100644
--- a/controller/pom.xml
+++ b/controller/pom.xml
@@ -131,24 +131,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
-                <executions>
-                    <execution>
-                        <id>enforce</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireUpperBoundDeps/>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 33377f007..5b3963ae7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,6 @@
         <slf4j.version>2.0.9</slf4j.version>
         <logback.version>1.4.11</logback.version>
         <etcd.version>0.7.6</etcd.version>
-        <awaitility.version>4.2.0</awaitility.version>
 
         <!-- Testing related -->
         <mockito-core.version>5.5.0</mockito-core.version>
@@ -98,13 +97,17 @@
                 </exclusions>
             </dependency>
 
+            <!-- Below artifact are not directly used by the project, but are required by the dependencies of the project. -->
             <dependency>
-                <groupId>org.awaitility</groupId>
-                <artifactId>awaitility</artifactId>
-                <version>${awaitility.version}</version>
-                <scope>test</scope>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>3.24.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okio</groupId>
+                <artifactId>okio-jvm</artifactId>
+                <version>3.2.0</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
@@ -137,13 +140,6 @@
             <artifactId>assertj-core</artifactId>
             <version>${assertj-core.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <!-- Exclude the byte-buddy, since the mockito-core already has a higher version of it. -->
-                    <groupId>net.bytebuddy</groupId>
-                    <artifactId>byte-buddy</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -163,6 +159,14 @@
             <version>${awaitility.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- Below dependencies are not directly used by the project, but are required by the dependencies of the project. -->
+        <dependency>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
+            <version>1.14.6</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -188,6 +192,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.4.1</version>
+                <executions>
+                    <execution>
+                        <id>enforce</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireUpperBoundDeps/>
+                                <banDuplicatePomDependencyVersions/>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file