Repository: nifi Updated Branches: refs/heads/master f7d2cd69d -> 2dc094765
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. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2dc09476 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2dc09476 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2dc09476 Branch: refs/heads/master Commit: 2dc094765d2b7393834ec649a5b35fb374b315fe Parents: f7d2cd6 Author: Bryan Rosander <[email protected]> Authored: Mon Aug 8 12:31:18 2016 -0400 Committer: Pierre Villard <[email protected]> Committed: Tue Aug 9 22:43:29 2016 +0200 ---------------------------------------------------------------------- nifi-assembly/NOTICE | 2 +- .../nifi-amqp-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-azure-nar/src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../nifi-evtx-nar/src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-nar/src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hive-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-ignite-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-mongodb-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-ranger-nar/src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../nifi-snmp-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-solr-nar/src/main/resources/META-INF/NOTICE | 2 +- .../nifi-splunk-nar/src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- nifi-toolkit/nifi-toolkit-assembly/NOTICE | 6 +++--- nifi-toolkit/nifi-toolkit-assembly/pom.xml | 6 ------ nifi-toolkit/nifi-toolkit-tls/pom.xml | 4 ---- pom.xml | 12 +++++++++++- 22 files changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 5bb181e..bc600e9 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index d82b16b..4b7a0df 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index f539055..ff0f432 100644 --- 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index ad8369e..c2f110b 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 046197d..a1c9e25 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 8de7a18..17016ea 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hadoop-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 7f4866e..9350dc8 100644 --- 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 \ No newline at end of file + Copyright 2002-2016 The Apache Software Foundation \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 4323947..894a43b 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index fa20405..c0565f0 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 5962705..ae2c248 100644 --- 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 81ab711..569fc02 100644 --- 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 http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 279e057..8275ff8 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 7c11b2f..ddd1770 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index e9642a2..5de68ea 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 2f6ed5f..d65cb7f 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 22c3bbe..125169e 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git 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 index 6554f3f..205d9ec 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/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 ---------------------------------------------------------------------- diff --git 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 index a5b700e..76ca05f 100644 --- 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: http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-toolkit/nifi-toolkit-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-assembly/NOTICE b/nifi-toolkit/nifi-toolkit-assembly/NOTICE index 7cd5ffc..653ba83 100644 --- 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. \ No newline at end of file + Copyright 1995-2015 Mort Bay Consulting Pty Ltd. http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-toolkit/nifi-toolkit-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-assembly/pom.xml b/nifi-toolkit/nifi-toolkit-assembly/pom.xml index edd5aa1..4439d5b 100644 --- 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> http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/nifi-toolkit/nifi-toolkit-tls/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml b/nifi-toolkit/nifi-toolkit-tls/pom.xml index 2c05755..247ebdb 100644 --- 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> http://git-wip-us.apache.org/repos/asf/nifi/blob/2dc09476/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bd62b85..821ce3c 100644 --- a/pom.xml +++ b/pom.xml @@ -245,6 +245,11 @@ language governing permissions and limitations under the License. --> <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> <version>1.10</version> @@ -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 -->
