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

NIFI-10769 Updated Accumulo from 2.0.1 to 2.1.0 

- Updated exclusions with Log4j 2 dependencies
- Removed exclusions no longer required based on Accumulo 2.1.0

This closes #6964

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
mr1716 2023-02-15 19:34:13 -05:00 committed by exceptionfactory
parent 40be70762a
commit 4d8c13b8e1
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
2 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
View File

@ -93,8 +93,12 @@
<artifactId>hibernate-validator</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-web</artifactId>
</exclusion>
</exclusions>
</dependency>

43
nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
View File

@ -19,7 +19,7 @@
</parent>
<properties>
<accumulo.version>2.0.1</accumulo.version>
<accumulo.version>2.1.0</accumulo.version>
</properties>
<artifactId>nifi-accumulo-bundle</artifactId>
@ -52,12 +52,6 @@
<artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
</dependency>
<!-- Override Guava from accumulo-core -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>
<!-- Override ZooKeeper from accumulo-core -->
<dependency>
<groupId>org.apache.zookeeper</groupId>
@ -70,46 +64,19 @@
</exclusion>
</exclusions>
</dependency>
<!-- Override commons-configuration2:2.5 from accumulo-core -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.8.0</version>
</dependency>
<!-- Override commons-beanutils -->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
<version>${accumulo.version}</version>
<exclusions>
<!-- Exclude spotbugs-annotations transitive dependency due to LGPL licensing -->
<exclusion>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>