From b5c3a2d7f9bfbd7364f0110aebd1fcd5a30bde1f Mon Sep 17 00:00:00 2001
From: Bryan Bende <bbende@apache.org>
Date: Fri, 11 Sep 2020 16:30:08 -0400
Subject: [PATCH] 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 <thenatog@gmail.com>

This closes #4525
---
 nifi-commons/nifi-security-utils/pom.xml      |  5 --
 nifi-commons/nifi-security-xml-config/pom.xml | 78 +++++++++++++++++++
 .../security/xml/SafeXMLConfiguration.java    |  0
 nifi-commons/pom.xml                          |  1 +
 .../nifi-lookup-services/pom.xml              |  5 ++
 5 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 nifi-commons/nifi-security-xml-config/pom.xml
 rename nifi-commons/{nifi-security-utils => nifi-security-xml-config}/src/main/java/org/apache/nifi/security/xml/SafeXMLConfiguration.java (100%)

diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
index 58d415112c..aa3167a4b8 100644
--- a/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi-commons/nifi-security-utils/pom.xml
@@ -84,11 +84,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-xml-config/pom.xml b/nifi-commons/nifi-security-xml-config/pom.xml
new file mode 100644
index 0000000000..55f95dc02f
--- /dev/null
+++ b/nifi-commons/nifi-security-xml-config/pom.xml
@@ -0,0 +1,78 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <!--
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements.  See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership.
+      The ASF licenses this file to You under the Apache License, Version 2.0
+      (the "License"); you may not use this file except in compliance with
+      the License.  You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+    -->
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.nifi</groupId>
+        <artifactId>nifi-commons</artifactId>
+        <version>1.13.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>nifi-security-xml-config</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-configuration2</artifactId>
+            <version>2.7</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes combine.children="append">
+                        <exclude>src/test/resources/xxe_template.xml</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <!-- This profile, activating when compiling on Java versions above 1.8, provides configuration changes to
+                 allow NiFi to be compiled on those JDKs. -->
+            <id>jigsaw</id>
+            <activation>
+                <jdk>(1.8,)</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-core</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.sun.activation</groupId>
+                    <artifactId>javax.activation</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+</project>
+
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 570b4b848a..ba574b877e 100644
--- a/nifi-commons/pom.xml
+++ b/nifi-commons/pom.xml
@@ -38,6 +38,7 @@
         <module>nifi-rocksdb-utils</module>
         <module>nifi-schema-utils</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>
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 2b1c303e52..51611712dd 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
@@ -175,6 +175,11 @@
             <version>1.13.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-security-xml-config</artifactId>
+            <version>1.13.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>