Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
exceptionfactory 2024-03-25 12:13:43 -05:00 committed by Pierre Villard
parent 358e4cb451
commit 8e0b83b025
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml
View File

@ -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>

6
nifi-nar-bundles/nifi-hive-bundle/pom.xml
View File

@ -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>

7
nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
View File

@ -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>

12
pom.xml
View File

@ -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>