NIFI-12945 Moved Commons Configuration 2.10.1 to shared version

- Moved Commons Configuration from nifi-lookup-services to project configuration - Moved Google Guava version from nifi-hive-test-utils to nifi-hive-bundle Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com> This closes #8560.
apache · Mar 27, 2024 · 8e0b83b · 8e0b83b
1 parent 358e4cb
commit 8e0b83b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
@@ -64,12 +64,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <!-- Override Guava 27 -->
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>32.1.2-jre</version>
-            </dependency>
             <!-- Override Jettison from Hive -->
             <dependency>
                 <groupId>org.codehaus.jettison</groupId>

diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -110,6 +110,12 @@
                 <artifactId>groovy-all</artifactId>
                 <version>2.4.21</version>
             </dependency>
+            <!-- Override Guava -->
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>32.1.2-jre</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-jdbc</artifactId>

diff --git a/...r-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml b/...r-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
@@ -51,13 +51,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-configuration2</artifactId>
-            <version>2.10.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/pom.xml b/pom.xml
@@ -118,6 +118,7 @@
         <org.apache.commons.cli.version>1.6.0</org.apache.commons.cli.version>
         <org.apache.commons.codec.version>1.16.1</org.apache.commons.codec.version>
         <org.apache.commons.compress.version>1.26.1</org.apache.commons.compress.version>
+        <org.apache.commons.configuration.version>2.10.1</org.apache.commons.configuration.version>
         <org.apache.commons.lang3.version>3.14.0</org.apache.commons.lang3.version>
         <org.apache.commons.net.version>3.10.0</org.apache.commons.net.version>
         <org.apache.commons.io.version>2.15.1</org.apache.commons.io.version>
@@ -272,6 +273,17 @@
                 <artifactId>commons-compress</artifactId>
                 <version>${org.apache.commons.compress.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-configuration2</artifactId>
+                <version>${org.apache.commons.configuration.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>