This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 8e0b83b025 NIFI-12945 Moved Commons Configuration 2.10.1 to shared
version
8e0b83b025 is described below
commit 8e0b83b0256addd25348eff2ab0dcd4d692f1fdb
Author: exceptionfactory <[email protected]>
AuthorDate: Mon Mar 25 12:13:43 2024 -0500
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 <[email protected]>
This closes #8560.
---
.../nifi-hive-bundle/nifi-hive-test-utils/pom.xml | 6 ------
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ++++++
.../nifi-lookup-services-bundle/nifi-lookup-services/pom.xml | 7 -------
pom.xml | 12 ++++++++++++
4 files changed, 18 insertions(+), 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
index c431e91ff5..8c88904f33 100644
--- 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
index 1c7544f072..f2a955b71a 100644
--- 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/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
index afe30e3129..3926ae32a6 100644
---
a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
+++
b/nifi-nar-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
index f343a01391..8a90650423 100644
--- 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>
