[FLINK-33339][Build/Shaded] Move Guava to parent POM

This resolves the problem where `curator-recipes` pulls a different Guava version via a transitive dependency
apache · Oct 23, 2023 · 8723f96 · 8723f96
1 parent fd6dd83
commit 8723f96
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/flink-shaded-guava-32/pom.xml b/flink-shaded-guava-32/pom.xml
@@ -34,10 +34,6 @@ under the License.
 
     <packaging>jar</packaging>
 
-    <properties>
-        <guava.version>32.1.3-jre</guava.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-35/pom.xml
@@ -122,6 +122,12 @@ under the License.
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- For dependency convergence -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-36/pom.xml
@@ -147,6 +147,12 @@ under the License.
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- For dependency convergence -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-37/pom.xml
@@ -132,6 +132,12 @@ under the License.
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- For dependency convergence -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml b/flink-shaded-zookeeper-parent/flink-shaded-zookeeper-38/pom.xml
@@ -136,6 +136,12 @@ under the License.
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- For dependency convergence -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/pom.xml b/pom.xml
@@ -64,6 +64,7 @@ under the License.
         <shading.prefix>org.apache.flink.shaded</shading.prefix>
         <netty.version>4.1.100.Final</netty.version>
         <jackson.version>2.14.2</jackson.version>
+        <guava.version>32.1.3-jre</guava.version>
         <!-- The license check requires the artifactId to match the directory that the module resides in.
              This is not the case for several modules in flink-shaded for legacy reasons.
              This property can be used by modules to add a suffix to the artifactId to match the directory name on CI