NIFI-2516 - Extract version info into parent pom, upgrade to commons-io 2.5

NIFI-2516 - Removing slf4j-api, version from slf4j-log4j12 This closes #809.
2025-02-21 09:59:15 +00:00 · 2016-08-08 12:31:18 -04:00 · 2016-08-08 12:31:18 -04:00 · 2dc094765d
commit 2dc094765d
parent f7d2cd69d4
22 changed files with 32 additions and 32 deletions
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@ -17,7 +17,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Net
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE
@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE
@ -21,4 +21,4 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/src/main/resources/META-INF/NOTICE
@ -18,7 +18,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Lucene
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE
@ -18,7 +18,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
      The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE
@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Net
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/src/main/resources/META-INF/NOTICE
@ -32,4 +32,4 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation
--- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE
@ -136,7 +136,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Net
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE
@ -72,7 +72,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Hive
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-nar/src/main/resources/META-INF/NOTICE
@ -28,4 +28,4 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation
--- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-nar/src/main/resources/META-INF/NOTICE
@ -21,4 +21,4 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation
--- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-nar/src/main/resources/META-INF/NOTICE
@ -86,7 +86,7 @@ Apache Software License v2
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
@ -23,7 +23,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
      The following NOTICE information applies:
        Apache Commons IO
-        Copyright 2002-2012 The Apache Software Foundation
+        Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
      The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/src/main/resources/META-INF/NOTICE
@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/src/main/resources/META-INF/NOTICE
@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache HttpComponents
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE
@ -13,7 +13,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE
@ -18,7 +18,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
    The following NOTICE information applies:
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service-nar/src/main/resources/META-INF/NOTICE
@ -134,7 +134,7 @@ Apache Software License v2
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Net
    The following NOTICE information applies:
--- a/nifi-toolkit/nifi-toolkit-assembly/NOTICE
+++ b/nifi-toolkit/nifi-toolkit-assembly/NOTICE
@ -24,7 +24,7 @@ The following binary components are provided under the Apache Software License v

  (ASLv2) Apache Commons CLI
    The following NOTICE information applies:
-      Apache Commons IO
+      Apache Commons CLI
      Copyright 2001-2015 The Apache Software Foundation

  (ASLv2) Apache Commons Codec
@ -47,7 +47,7 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Apache Commons IO
    The following NOTICE information applies:
      Apache Commons IO
-      Copyright 2002-2012 The Apache Software Foundation
+      Copyright 2002-2016 The Apache Software Foundation

  (ASLv2) Apache Commons Lang
    The following NOTICE information applies:
@ -91,4 +91,4 @@ The following binary components are provided under the Apache Software License v
  (ASLv2) Jetty
    The following NOTICE information applies:
       Jetty Web Container
-       Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
+       Copyright 1995-2015 Mort Bay Consulting Pty Ltd.
--- a/nifi-toolkit/nifi-toolkit-assembly/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-assembly/pom.xml
@ -68,7 +68,6 @@ language governing permissions and limitations under the License. -->
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
            <scope>compile</scope>
-            <version>1.7.12</version>
        </dependency>
        <dependency>
            <groupId>org.eclipse.jetty</groupId>
@ -80,10 +79,5 @@ language governing permissions and limitations under the License. -->
            <artifactId>javax.servlet-api</artifactId>
            <scope>compile</scope>
        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.5</version>
-        </dependency>
    </dependencies>
 </project>
--- a/nifi-toolkit/nifi-toolkit-tls/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml
@ -38,7 +38,6 @@
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.12</version>
        </dependency>
        <dependency>
            <groupId>org.bouncycastle</groupId>
@ -51,12 +50,10 @@
        <dependency>
            <groupId>commons-cli</groupId>
            <artifactId>commons-cli</artifactId>
-            <version>1.3.1</version>
        </dependency>
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
-            <version>2.5</version>
        </dependency>
        <dependency>
            <groupId>org.eclipse.jetty</groupId>
@ -69,7 +66,6 @@
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
        </dependency>
    </dependencies>
    <build>
--- a/pom.xml
+++ b/pom.xml
@ -244,6 +244,11 @@ language governing permissions and limitations under the License. -->
                <artifactId>ignite-log4j2</artifactId>
                <version>1.6.0</version>
            </dependency>
+            <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.3.1</version>
+            </dependency>
            <dependency>
                <groupId>commons-codec</groupId>
                <artifactId>commons-codec</artifactId>
@ -257,7 +262,7 @@ language governing permissions and limitations under the License. -->
            <dependency>
                <groupId>commons-io</groupId>
                <artifactId>commons-io</artifactId>
-                <version>2.4</version>
+                <version>2.5</version>
            </dependency>
            <dependency>
                <groupId>org.bouncycastle</groupId>
@ -781,6 +786,11 @@ language governing permissions and limitations under the License. -->
                <artifactId>curator-recipes</artifactId>
                <version>2.11.0</version>
            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>${org.slf4j.version}</version>
+            </dependency>

            
            <!-- Test Dependencies for testing interactions with ZooKeeper -->