You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/09/17 22:09:00 UTC
[nifi] 05/15: NIFI-7802 Remove commons-configuration2 dependency
from nifi-security-utils which ends up nifi-standard-services-api and on
the classpath of any standard services
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.12.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit f41adc6e642f103b356a47e3eac2a7719a302595
Author: Bryan Bende <bb...@apache.org>
AuthorDate: Fri Sep 11 16:30:08 2020 -0400
NIFI-7802 Remove commons-configuration2 dependency from nifi-security-utils which ends up nifi-standard-services-api and on the classpath of any standard services
Signed-off-by: Nathan Gough <th...@gmail.com>
This closes #4525
---
nifi-commons/nifi-security-utils/pom.xml | 5 --
.../pom.xml | 72 +---------------------
.../nifi/security/xml/SafeXMLConfiguration.java | 0
nifi-commons/pom.xml | 1 +
4 files changed, 3 insertions(+), 75 deletions(-)
diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
index 2b7bd58..c35cc47 100644
--- a/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi-commons/nifi-security-utils/pom.xml
@@ -89,11 +89,6 @@
<artifactId>spock-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-configuration2</artifactId>
- <version>2.7</version>
- </dependency>
</dependencies>
<build>
diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-xml-config/pom.xml
similarity index 53%
copy from nifi-commons/nifi-security-utils/pom.xml
copy to nifi-commons/nifi-security-xml-config/pom.xml
index 2b7bd58..55f95dc 100644
--- a/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi-commons/nifi-security-xml-config/pom.xml
@@ -17,79 +17,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.12.1-SNAPSHOT</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
- <artifactId>nifi-security-utils</artifactId>
- <description>
- This nifi-security-utils module is meant to hold the majority of utilities
- that one could need to enable secure transport or interact with encryption.
- Care should be taken to keep the number of dependencies to a minimum given the
- utility nature of this library.
- </description>
+ <artifactId>nifi-security-xml-config</artifactId>
<dependencies>
<dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-api</artifactId>
- <version>1.12.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-utils</artifactId>
- <version>1.12.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-security-utils-api</artifactId>
- <version>1.13.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.9</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.14</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>1.66</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.66</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-properties</artifactId>
- <version>1.12.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>at.favre.lib</groupId>
- <artifactId>bcrypt</artifactId>
- <version>0.9.0</version>
- </dependency>
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minikdc</artifactId>
- <version>3.1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.spockframework</groupId>
- <artifactId>spock-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.7</version>
diff --git a/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/xml/SafeXMLConfiguration.java b/nifi-commons/nifi-security-xml-config/src/main/java/org/apache/nifi/security/xml/SafeXMLConfiguration.java
similarity index 100%
rename from nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/xml/SafeXMLConfiguration.java
rename to nifi-commons/nifi-security-xml-config/src/main/java/org/apache/nifi/security/xml/SafeXMLConfiguration.java
diff --git a/nifi-commons/pom.xml b/nifi-commons/pom.xml
index b9efb53..2c31b66 100644
--- a/nifi-commons/pom.xml
+++ b/nifi-commons/pom.xml
@@ -39,6 +39,7 @@
<module>nifi-schema-utils</module>
<module>nifi-security-utils-api</module>
<module>nifi-security-utils</module>
+ <module>nifi-security-xml-config</module>
<module>nifi-site-to-site-client</module>
<module>nifi-socket-utils</module>
<module>nifi-utils</module>