From 283d2ee3751956d5fdc6be7965dcbe4f99787930 Mon Sep 17 00:00:00 2001 From: exceptionfactory Date: Wed, 15 Dec 2021 16:47:44 -0600 Subject: [PATCH] NIFI-9491 Excluded commons-logging and added jcl-over-slf4j references Signed-off-by: Matthew Burgess This closes #5608 --- minifi/minifi-assembly/NOTICE | 5 -- minifi/minifi-c2/minifi-c2-assembly/NOTICE | 5 -- .../minifi-c2-cache-s3/pom.xml | 12 ++- .../src/main/resources/META-INF/NOTICE | 5 -- .../minifi-toolkit-assembly/NOTICE | 5 -- nifi-assembly/NOTICE | 13 --- .../nifi-kafka-connector-assembly/NOTICE | 5 -- .../nifi-accumulo-processors/pom.xml | 4 + .../nifi-accumulo-services-api/pom.xml | 4 + nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 13 --- .../nifi-atlas-reporting-task/pom.xml | 16 ++-- nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 12 +++ .../nifi-aws-abstract-processors/pom.xml | 20 ++--- .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 + .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-aws-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-aws-service-api/pom.xml | 10 --- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 19 +++++ .../nifi-azure-reporting-task/pom.xml | 5 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 11 +++ .../src/main/resources/META-INF/NOTICE | 8 -- .../src/main/resources/META-INF/NOTICE | 8 -- .../src/main/resources/META-INF/NOTICE | 8 -- .../nifi-ccda-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-datadog-reporting-task/pom.xml | 8 ++ .../src/main/resources/META-INF/NOTICE | 13 --- .../nifi-druid-controller-service-api/pom.xml | 76 +----------------- nifi-nar-bundles/nifi-druid-bundle/pom.xml | 80 +++++++++++++++++++ .../nifi-easyrules-service/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 18 ----- .../src/main/resources/META-INF/NOTICE | 18 ----- .../nifi-elasticsearch-client-service/pom.xml | 15 +++- .../src/main/resources/META-INF/NOTICE | 18 ----- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-email-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-enrich-processors/pom.xml | 8 ++ .../nifi-hadoop-utils/pom.xml | 18 +++++ .../nifi-hadoop-record-utils/pom.xml | 8 ++ .../nifi-flume-processors/pom.xml | 16 ++++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-framework/nifi-web/pom.xml | 6 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-gcp-processors/pom.xml | 29 ++++++- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-gcp-services-api/pom.xml | 17 ++++ .../nifi-graph-test-clients/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 13 --- .../nifi-grpc-nar/src/main/resources/NOTICE | 8 -- .../nifi-hdfs-processors/pom.xml | 12 +++ .../nifi-hadoop-libraries-nar/pom.xml | 8 ++ .../src/main/resources/META-INF/NOTICE | 7 +- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive-processors/pom.xml | 26 ++++++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive3-processors/pom.xml | 34 ++++++++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hive_1_1-processors/pom.xml | 26 ++++++ .../nifi-hl7-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-ignite-processors/pom.xml | 6 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-jms-processors/pom.xml | 5 +- .../nifi-kite-processors/pom.xml | 20 +++++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-media-processors/pom.xml | 8 ++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-parquet-processors/pom.xml | 8 ++ .../nifi-poi-processors/pom.xml | 10 +++ .../nifi-prometheus-reporting-task/pom.xml | 22 +++-- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-ranger-plugin/pom.xml | 28 +++++++ .../nifi-ranger-resources/pom.xml | 14 ++++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-slack-processors/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-twitter-processors/pom.xml | 8 ++ .../nifi-solr-processors/pom.xml | 6 -- .../nifi-livy-controller-service-api/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-livy-processors/pom.xml | 4 + nifi-nar-bundles/nifi-spark-bundle/pom.xml | 6 ++ .../nifi-spring-processors/pom.xml | 6 -- .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-sql-reporting-tasks/pom.xml | 10 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-standard-processors/pom.xml | 4 + nifi-nar-bundles/nifi-standard-bundle/pom.xml | 10 +++ .../nifi-dbcp-service/pom.xml | 10 +++ .../nifi-hadoop-dbcp-service/pom.xml | 14 ++++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hbase_1_1_2-client-service/pom.xml | 12 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-hbase_2-client-service/pom.xml | 12 +++ .../src/main/resources/META-INF/NOTICE | 5 -- .../nifi-lookup-services/pom.xml | 20 +++++ .../nifi-registry-web-ui/pom.xml | 10 +++ .../nifi-registry-aws-assembly/NOTICE | 16 ---- .../nifi-registry-aws-extensions/pom.xml | 10 +++ .../nifi-registry-ranger-assembly/NOTICE | 5 -- .../nifi-registry-ranger-plugin/pom.xml | 28 +++++++ nifi-stateless/nifi-stateless-assembly/NOTICE | 5 -- .../src/main/resources/META-INF/NOTICE | 5 -- nifi-toolkit/nifi-toolkit-admin/pom.xml | 6 ++ nifi-toolkit/nifi-toolkit-cli/pom.xml | 10 +++ .../nifi-toolkit-encrypt-config/pom.xml | 12 +++ nifi-toolkit/nifi-toolkit-tls/pom.xml | 10 +++ pom.xml | 2 + 114 files changed, 803 insertions(+), 458 deletions(-) diff --git a/minifi/minifi-assembly/NOTICE b/minifi/minifi-assembly/NOTICE index 422185cee1..86c9da3243 100644 --- a/minifi/minifi-assembly/NOTICE +++ b/minifi/minifi-assembly/NOTICE @@ -82,11 +82,6 @@ The following binary components are provided under the Apache Software License v Apache Jakarta HttpClient Copyright 1999-2007 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/minifi/minifi-c2/minifi-c2-assembly/NOTICE b/minifi/minifi-c2/minifi-c2-assembly/NOTICE index fc7727f9a8..8dbf0ee4be 100644 --- a/minifi/minifi-c2/minifi-c2-assembly/NOTICE +++ b/minifi/minifi-c2/minifi-c2-assembly/NOTICE @@ -140,11 +140,6 @@ The following binary components are provided under the Apache Software License v This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See https://www.jcip.net - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Net The following NOTICE information applies: Apache Commons Net diff --git a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml index 4a0b36d4a4..3bb0fd1620 100644 --- a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml +++ b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml @@ -35,11 +35,21 @@ limitations under the License. com.amazonaws aws-java-sdk-s3 ${aws.sdk.version} + + + commons-logging + commons-logging + + org.apache.commons commons-lang3 - + + + org.slf4j + jcl-over-slf4j + junit junit diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE index 3619913332..6b42cc2573 100644 --- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE +++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/src/main/resources/META-INF/NOTICE @@ -68,11 +68,6 @@ The following binary components are provided under the Apache Software License v This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/minifi/minifi-toolkit/minifi-toolkit-assembly/NOTICE b/minifi/minifi-toolkit/minifi-toolkit-assembly/NOTICE index 5cb578c091..7b41748a74 100644 --- a/minifi/minifi-toolkit/minifi-toolkit-assembly/NOTICE +++ b/minifi/minifi-toolkit/minifi-toolkit-assembly/NOTICE @@ -89,11 +89,6 @@ The following binary components are provided under the Apache Software License v This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See https://www.jcip.net - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Net The following NOTICE information applies: Apache Commons Net diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index baa85527f1..13ce4c6ab4 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -204,11 +204,6 @@ The following binary components are provided under the Apache Software License v Apache Jakarta HttpClient Copyright 1999-2007 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2016 The Apache Software Foundation - (ASLv2) Apache Commons VFS The following NOTICE information applies: Apache Commons VFS @@ -1526,14 +1521,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/NOTICE b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/NOTICE index 219960e9ef..a3681d429f 100644 --- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/NOTICE +++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/NOTICE @@ -35,11 +35,6 @@ The following binary components are provided under the Apache Software License v This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml index 29526dc088..d1015246ca 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml @@ -41,6 +41,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.commons commons-lang3 diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml index ea93e7d077..5af459abc2 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml @@ -34,6 +34,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.commons commons-lang3 diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml index 59cdb3ba87..ec3a743369 100644 --- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml @@ -53,6 +53,12 @@ commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + org.apache.accumulo @@ -72,6 +78,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/NOTICE index 1e96d8174f..bb0ab1514e 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/src/main/resources/META-INF/NOTICE @@ -120,11 +120,6 @@ The following binary components are provided under the Apache Software License v This product includes software from the Spring Framework, under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Math The following NOTICE information applies: Apache Commons Math @@ -405,14 +400,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * http://www.slf4j.org/ - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml index 7a600fc480..2391532386 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml @@ -34,6 +34,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-processor-utils @@ -59,17 +63,17 @@ commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + org.apache.atlas atlas-client-v2 - - - log4j - log4j - - org.apache.atlas diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index 9831b7e0cb..8fc9ce0aa2 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -52,6 +52,14 @@ org.slf4j slf4j-log4j12 + + log4j + log4j + + + commons-logging + commons-logging + @@ -67,6 +75,10 @@ log4j log4j + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml index 52bb924d45..7aefb47a1b 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml @@ -28,16 +28,6 @@ com.amazonaws aws-java-sdk-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - - com.amazonaws @@ -51,6 +41,16 @@ com.amazonaws amazon-kinesis-client ${aws-kinesis-client-library-version} + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j com.amazonaws diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml index 9c5499fdbe..6c7a90acfa 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml @@ -46,6 +46,10 @@ nifi-aws-parameter-value-providers 1.15.2-SNAPSHOT + + org.slf4j + jcl-over-slf4j + diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE index b67581f4fa..b7761af553 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/src/main/resources/META-INF/NOTICE @@ -43,11 +43,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml index a151a804a0..38d72f9d89 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml @@ -61,6 +61,16 @@ commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j org.apache.nifi diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/src/main/resources/META-INF/NOTICE index f12ab6fb15..0c03647b1e 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/src/main/resources/META-INF/NOTICE @@ -43,11 +43,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Amazon Web Services SDK The following NOTICE information applies: Copyright 2010-2014 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml index 8d6ba7605c..3ad6c2d2a8 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml @@ -27,16 +27,6 @@ com.amazonaws aws-java-sdk-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - - com.amazonaws diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml index a46363609d..68c50a681f 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml @@ -41,6 +41,25 @@ pom import + + com.amazonaws + aws-java-sdk-core + ${aws-java-sdk-version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + + + commons-logging + commons-logging + + + diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml index 89e320b31e..9e3c0f4fcb 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml @@ -45,7 +45,10 @@ org.apache.httpcomponents httpclient - 4.5.5 + + + org.slf4j + jcl-over-slf4j diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index a9b549cb66..7181bf9f44 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -97,6 +97,17 @@ commons-text 1.8 + + org.apache.httpcomponents + httpclient + 4.5.13 + + + commons-logging + commons-logging + + + diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/src/main/resources/META-INF/NOTICE index 4307bc8a19..6bd6684a51 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/src/main/resources/META-INF/NOTICE @@ -253,14 +253,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/src/main/resources/META-INF/NOTICE index 789199b38c..2d9d2aa147 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/src/main/resources/META-INF/NOTICE @@ -159,14 +159,6 @@ Apache Software License v2 * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/src/main/resources/META-INF/NOTICE index 5d0ad5c610..f2261add86 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/src/main/resources/META-INF/NOTICE @@ -236,14 +236,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml index 7c8884bb66..d053886793 100644 --- a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml +++ b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml @@ -39,6 +39,16 @@ org.apache.commons commons-jexl3 3.1 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j org.openehealth.ipf.oht.mdht diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/src/main/resources/META-INF/NOTICE index ea16d07882..6e91d283e3 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/src/main/resources/META-INF/NOTICE @@ -61,11 +61,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Jackson JSON processor The following NOTICE information applies: # Jackson JSON processor diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml index 8ef18f64d4..8f0916914b 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml @@ -62,8 +62,16 @@ com.fasterxml.jackson.core jackson-databind + + commons-logging + commons-logging + + + org.slf4j + jcl-over-slf4j + com.fasterxml.jackson.core jackson-databind diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE index 6a9ebf8ecc..1204545bbf 100644 --- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/src/main/resources/META-INF/NOTICE @@ -78,11 +78,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons DBCP The following NOTICE information applies: Apache Commons DBCP @@ -466,14 +461,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml index efa0f0cd75..d8fa63b6dc 100644 --- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml @@ -38,64 +38,6 @@ io.druid tranquility-core_2.11 - - - io.druid - druid-console - - - io.druid - druid-aws-common - - - c3p0 - c3p0 - - - io.tesla.aether - tesla-aether - - - org.glassfish - javax.el - - - com.sun.jersey - * - - - org.eclipse.jetty - * - - - org.eclipse.aether - aether-api - - - com.maxmind.geoip2 - geoip2 - - - net.java.dev.jets3t - jets3t - - - io.druid - druid-server - - - mysql - mysql-connector-java - - - com.google.code.findbugs - jsr305 - - - org.bouncycastle - bcprov-jdk15on - - io.druid @@ -112,20 +54,6 @@ io.druid druid-processing ${druid.version} - - - net.java.dev.jets3t - jets3t - - - io.airlift - airline - - - com.google.code.findbugs - jsr305 - - com.github.stephenc.findbugs @@ -141,5 +69,9 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-druid-bundle/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/pom.xml index 92ac905b35..5a2e43e856 100644 --- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml @@ -36,11 +36,91 @@ io.druid tranquility-core_2.11 ${tranquility.version} + + + io.druid + druid-console + + + io.druid + druid-aws-common + + + c3p0 + c3p0 + + + io.tesla.aether + tesla-aether + + + org.glassfish + javax.el + + + com.sun.jersey + * + + + org.eclipse.jetty + * + + + org.eclipse.aether + aether-api + + + com.maxmind.geoip2 + geoip2 + + + net.java.dev.jets3t + jets3t + + + io.druid + druid-server + + + mysql + mysql-connector-java + + + com.google.code.findbugs + jsr305 + + + org.bouncycastle + bcprov-jdk15on + + + commons-logging + commons-logging + + io.druid druid-processing ${druid.version} + + + net.java.dev.jets3t + jets3t + + + io.airlift + airline + + + com.google.code.findbugs + jsr305 + + + commons-logging + commons-logging + + diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml index c83e0d47bb..07eb3432e7 100644 --- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml +++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml @@ -61,6 +61,16 @@ org.apache.commons commons-jexl3 3.1 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j com.fasterxml.jackson.core diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-nar/src/main/resources/META-INF/NOTICE index c0a652e306..8931a19f45 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-nar/src/main/resources/META-INF/NOTICE @@ -337,14 +337,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * http://www.slf4j.org/ - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: @@ -374,16 +366,6 @@ The following binary components are provided under the Apache Software License v The code for the t-digest was originally authored by Ted Dunning A number of small but very helpful changes have been contributed by Adrien Grand (https://github.com/jpountz) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - - Apache Commons Logging - Copyright 2003-2016 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - (ASLv2) Apache Commons Codec The following NOTICE information applies: Apache Commons Codec diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/src/main/resources/META-INF/NOTICE index 427a8aae2f..c844811826 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/src/main/resources/META-INF/NOTICE @@ -337,14 +337,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * http://www.slf4j.org/ - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: @@ -374,16 +366,6 @@ The following binary components are provided under the Apache Software License v The code for the t-digest was originally authored by Ted Dunning A number of small but very helpful changes have been contributed by Adrien Grand (https://github.com/jpountz) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - - Apache Commons Logging - Copyright 2003-2016 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - (ASLv2) Apache Commons Codec The following NOTICE information applies: Apache Commons Codec diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml index d14d885220..fa67da246e 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml @@ -124,7 +124,10 @@ org.slf4j log4j-over-slf4j - + + org.slf4j + jcl-over-slf4j + com.jayway.jsonpath json-path @@ -134,6 +137,12 @@ org.apache.httpcomponents httpclient 4.5.13 + + + commons-logging + commons-logging + + @@ -152,6 +161,10 @@ com.vividsolutions jts + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/NOTICE index e0b733f170..baa0c94b7d 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/src/main/resources/META-INF/NOTICE @@ -337,14 +337,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * http://www.slf4j.org/ - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: @@ -374,16 +366,6 @@ The following binary components are provided under the Apache Software License v The code for the t-digest was originally authored by Ted Dunning A number of small but very helpful changes have been contributed by Adrien Grand (https://github.com/jpountz) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - - Apache Commons Logging - Copyright 2003-2016 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (http://www.apache.org/). - - (ASLv2) Apache Commons Codec The following NOTICE information applies: Apache Commons Codec diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/NOTICE index 4382baef37..30b45afe3a 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/src/main/resources/META-INF/NOTICE @@ -28,11 +28,6 @@ The following binary components are provided under the Apache Software License v This product includes software from the Spring Framework, under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2016 The Apache Software Foundation - (ASLv2) Apache HttpComponents The following NOTICE information applies: Apache HttpClient diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 221a1820fa..58c9f370d7 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -83,6 +83,16 @@ com.microsoft.ews-java-api ews-java-api 2.0 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j org.apache.nifi diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/src/main/resources/META-INF/NOTICE index 72c30d1f3a..9c0802dfb1 100644 --- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/src/main/resources/META-INF/NOTICE @@ -46,11 +46,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Net The following NOTICE information applies: Apache Commons Net diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml index 6131ebc188..5eb0e9a744 100644 --- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml +++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml @@ -48,8 +48,16 @@ com.google.code.findbugs jsr305 + + commons-logging + commons-logging + + + org.slf4j + jcl-over-slf4j + com.github.stephenc.findbugs findbugs-annotations diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml index 6ae0c3b836..49949e47bf 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml @@ -52,6 +52,10 @@ commons-lang3 3.9 + + org.slf4j + jcl-over-slf4j + org.apache.hadoop @@ -67,6 +71,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -83,6 +91,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -90,6 +102,12 @@ httpclient 4.5.5 provided + + + commons-logging + commons-logging + + diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml index fcdad9f24d..b01be92d0f 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml @@ -70,8 +70,16 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-record-serialization-service-api diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml index fbb48a1f52..3f1209f6ee 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml @@ -64,6 +64,10 @@ log4j log4j + + commons-logging + commons-logging + @@ -101,6 +105,10 @@ com.fasterxml.jackson.core jackson-databind + + commons-logging + commons-logging + @@ -129,6 +137,10 @@ log4j log4j + + commons-logging + commons-logging + @@ -141,6 +153,10 @@ log4j log4j + + commons-logging + commons-logging + 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 6a77e4c6d8..1aca0f07d4 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 @@ -81,11 +81,6 @@ The following binary components are provided under the Apache Software License v This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml index 7fd62c6853..c32c6efb0e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml @@ -71,6 +71,12 @@ commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE index a2e53927aa..87bce53502 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/src/main/resources/META-INF/NOTICE @@ -68,11 +68,6 @@ The following binary components are provided under the Apache Software License v This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE index 1147769f59..76345bc744 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/src/main/resources/META-INF/NOTICE @@ -68,11 +68,6 @@ The following binary components are provided under the Apache Software License v This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE index 8f1fe28c11..3ca95f7ad5 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/src/main/resources/META-INF/NOTICE @@ -73,11 +73,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Guava The following NOTICE information applies: Guava diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml index c3ff19440f..81bccca352 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml @@ -84,16 +84,43 @@ com.google.cloud google-cloud-bigquery + + + commons-logging + commons-logging + + com.google.cloud google-cloud-pubsub + + + commons-logging + commons-logging + + + + + com.google.cloud + google-cloud-pubsublite + 1.3.0 + + + commons-logging + commons-logging + + com.tdunning json 1.8 + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-json-utils @@ -152,4 +179,4 @@ - \ No newline at end of file + diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/src/main/resources/META-INF/NOTICE index 0a42bf8105..0146cca709 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/src/main/resources/META-INF/NOTICE @@ -40,11 +40,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Guava The following NOTICE information applies: Guava diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml index f8ede7c158..ba1115d60d 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml @@ -38,8 +38,25 @@ com.google.code.findbugs jsr305 + + com.google.guava + guava + + + commons-logging + commons-logging + + + org.slf4j + jcl-over-slf4j + + + com.google.guava + guava + 31.0.1-jre + com.github.stephenc.findbugs findbugs-annotations diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml index c9eff4cdc3..2f50fff0ad 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-test-clients/pom.xml @@ -104,12 +104,22 @@ org.janusgraph janusgraph-core 0.5.3 + + + commons-logging + commons-logging + + org.janusgraph janusgraph-inmemory 0.5.3 + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service-nar/src/main/resources/META-INF/NOTICE index bb2b72c5a1..95cad83440 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-neo4j-cypher-service-nar/src/main/resources/META-INF/NOTICE @@ -70,11 +70,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE index 9fd747cb15..6b3e063ae4 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-other-graph-services-nar/src/main/resources/META-INF/NOTICE @@ -72,11 +72,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO @@ -363,14 +358,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-nar/src/main/resources/NOTICE b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-nar/src/main/resources/NOTICE index aea5fdc66f..ce543d6c62 100644 --- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-nar/src/main/resources/NOTICE +++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-nar/src/main/resources/NOTICE @@ -232,14 +232,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * http://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml index 3399b80795..716ba6a642 100644 --- a/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml @@ -56,6 +56,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -68,6 +72,10 @@ log4j log4j + + commons-logging + commons-logging + @@ -76,6 +84,10 @@ ${hadoop.version} provided + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-distributed-cache-client-service-api diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml index 14cea4c473..f2eae375ce 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml @@ -42,12 +42,20 @@ log4j log4j + + commons-logging + commons-logging + org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.avro avro 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 2f27715288..dde0af6537 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 @@ -146,12 +146,7 @@ The following binary components are provided under the Apache Software License v (ASLv2) Apache Commons Collections The following NOTICE information applies: Apache Commons Collections - Copyright 2001-2008 The Apache Software Foundation - - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation + Copyright 2001-2008 The Apache Software Foundation (ASLv2) Apache Commons Lang The following NOTICE information applies: 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 d3c62059b0..cd4b48891e 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 @@ -65,11 +65,6 @@ The following binary components are provided under the Apache Software License v Apache HttpComponents Core - HttpCore Copyright 2006-2009 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Pool The following NOTICE information applies: Apache Commons Pool diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml index 615f1c3075..5122b5e5c4 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml @@ -84,6 +84,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -103,6 +107,10 @@ log4j apache-log4j-extras + + commons-logging + commons-logging + @@ -120,6 +128,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -139,6 +151,10 @@ log4j log4j + + commons-logging + commons-logging + @@ -165,11 +181,21 @@ org.apache.commons commons-dbcp2 2.7.0 + + + commons-logging + commons-logging + + org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE index daeb357087..642395d17f 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/src/main/resources/META-INF/NOTICE @@ -71,11 +71,6 @@ The following binary components are provided under the Apache Software License v Apache HttpComponents Core - HttpCore Copyright 2006-2009 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Pool The following NOTICE information applies: Apache Commons Pool diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml index af7a57381b..6af7bd34b9 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml @@ -95,6 +95,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -107,6 +111,10 @@ log4j log4j + + commons-logging + commons-logging + @@ -158,6 +166,14 @@ log4j log4j + + commons-logging + commons-logging + + + hadoop-common + org.apache.hadoop + @@ -189,6 +205,10 @@ org.apache.hive hive-exec + + commons-logging + commons-logging + @@ -204,6 +224,10 @@ org.apache.hive hive-exec + + commons-logging + commons-logging + @@ -238,11 +262,21 @@ org.apache.commons commons-dbcp2 2.7.0 + + + commons-logging + commons-logging + + org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.hamcrest hamcrest-all diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-nar/src/main/resources/META-INF/NOTICE index aef18f21ff..e09c83e2f7 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-nar/src/main/resources/META-INF/NOTICE @@ -51,11 +51,6 @@ The following binary components are provided under the Apache Software License v Apache HttpComponents Core - HttpCore Copyright 2006-2009 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Pool The following NOTICE information applies: Apache Commons Pool diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml index 8573648562..778c02864f 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive_1_1-processors/pom.xml @@ -94,6 +94,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -113,6 +117,10 @@ log4j apache-log4j-extras + + commons-logging + commons-logging + @@ -124,6 +132,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -147,6 +159,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -173,11 +189,21 @@ org.apache.commons commons-dbcp2 2.7.0 + + + commons-logging + commons-logging + + org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml b/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml index eea8865458..d558fbfe3d 100644 --- a/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hl7-bundle/nifi-hl7-processors/pom.xml @@ -62,6 +62,16 @@ commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j ca.uhn.hapi 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 776adc5830..76fd48ee95 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 @@ -38,11 +38,6 @@ The following binary components are provided under the Apache Software License v Apache Commons IO Copyright 2002-2016 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml index 5143b4d6de..51d5e01792 100644 --- a/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml +++ b/nifi-nar-bundles/nifi-ignite-bundle/nifi-ignite-processors/pom.xml @@ -56,6 +56,12 @@ org.apache.ignite ignite-spring 1.6.0 + + + commons-logging + commons-logging + + org.apache.nifi diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/src/main/resources/META-INF/NOTICE index 76e393d3b3..c027d8e24b 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/src/main/resources/META-INF/NOTICE @@ -20,11 +20,6 @@ The following binary components are provided under the Apache Software License v Apache Commons IO Copyright 2002-2016 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Spring Framework The following NOTICE information applies: Spring Framework diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml index 4ef94927df..2680f645d0 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml @@ -47,9 +47,8 @@ ${spring.version} - commons-logging - commons-logging - 1.2 + org.slf4j + jcl-over-slf4j org.apache.activemq diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml index c0c7809af1..833170fa2b 100644 --- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml @@ -55,6 +55,10 @@ com.google.code.findbugs jsr305 + + commons-logging + commons-logging + @@ -103,6 +107,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -200,6 +208,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + @@ -212,6 +224,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + @@ -311,6 +327,10 @@ org.slf4j slf4j-log4j12 + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/src/main/resources/META-INF/NOTICE index 1ebd79b61a..fe2b8c3429 100644 --- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-nar/src/main/resources/META-INF/NOTICE @@ -135,11 +135,6 @@ The following binary components are provided under the Apache Software License v Apache Commons Collections Copyright 2001-2013 The Apache Software Foundation - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons VFS The following NOTICE information applies: Apache Commons VFS diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml index a56a1351c8..c2a531e765 100644 --- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml +++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml @@ -55,8 +55,16 @@ com.fasterxml.jackson.core jackson-core + + commons-logging + commons-logging + + + org.slf4j + jcl-over-slf4j + diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE index 1137e7661b..af29be56ed 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services-nar/src/main/resources/META-INF/NOTICE @@ -70,11 +70,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Net The following NOTICE information applies: Apache Commons Net diff --git a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml index 463eb0423e..b1b545d4e7 100644 --- a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml +++ b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml @@ -33,6 +33,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-utils @@ -56,6 +60,10 @@ com.fasterxml.jackson.core jackson-databind + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml index 73429450d3..46e04f5366 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml +++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml @@ -53,6 +53,16 @@ de.rototor.pdfbox graphics2d 0.32 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j org.apache.poi diff --git a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml index 569f081ca8..38200e56c0 100644 --- a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml @@ -92,11 +92,21 @@ ${jetty.version} - org.apache.httpcomponents - httpclient - 4.5.3 - test + org.apache.httpcomponents + httpclient + 4.5.3 + test + + + commons-logging + commons-logging + + - - + + org.slf4j + jcl-over-slf4j + test + + 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 825f5b493a..c116781da2 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 @@ -96,11 +96,6 @@ Apache Software License v2 This product includes software from the Spring Framework, under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Math The following NOTICE information applies: Apache Commons Math diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml index 804e342891..daf2c5bed8 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml +++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml @@ -40,6 +40,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.ranger ranger-plugins-common @@ -57,6 +61,10 @@ com.google.code.findbugs jsr305 + + commons-logging + commons-logging + @@ -72,6 +80,10 @@ log4j log4j + + commons-logging + commons-logging + @@ -87,6 +99,10 @@ org.slf4j slf4j-api + + commons-logging + commons-logging + @@ -104,6 +120,10 @@ log4j log4j + + commons-logging + commons-logging + org.apache.solr diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api/pom.xml index e1b77e6a31..259e7ef918 100644 --- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service-api/pom.xml @@ -32,6 +32,16 @@ org.apache.httpcomponents httpclient 4.5.5 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-nar/src/main/resources/META-INF/NOTICE index ecde2d0192..aeace6f413 100644 --- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-nar/src/main/resources/META-INF/NOTICE @@ -43,11 +43,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons IO The following NOTICE information applies: Apache Commons IO diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml index d073f7fc05..ba19939200 100644 --- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml +++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/pom.xml @@ -38,6 +38,10 @@ commons-configuration commons-configuration + + org.slf4j + jcl-over-slf4j + org.codehaus.jettison jettison diff --git a/nifi-nar-bundles/nifi-spark-bundle/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/pom.xml index 378f945e1f..2b352f0351 100644 --- a/nifi-nar-bundles/nifi-spark-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-spark-bundle/pom.xml @@ -52,6 +52,12 @@ commons-configuration commons-configuration 1.10 + + + commons-logging + commons-logging + + com.sun.jersey diff --git a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml index 146ff48ed8..aa94e03dc4 100644 --- a/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml +++ b/nifi-nar-bundles/nifi-spring-bundle/nifi-spring-processors/pom.xml @@ -59,12 +59,6 @@ 1.15.2-SNAPSHOT test - - commons-logging - commons-logging - 1.2 - test - org.springframework.integration spring-integration-core diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-nar/src/main/resources/META-INF/NOTICE index 2487232081..e4218b8b8b 100644 --- a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-nar/src/main/resources/META-INF/NOTICE @@ -27,11 +27,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache HttpComponents The following NOTICE information applies: Apache HttpClient diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml index a79a2ff363..b9280278ca 100644 --- a/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml +++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/nifi-sql-reporting-tasks/pom.xml @@ -63,6 +63,16 @@ org.apache.calcite calcite-core 1.21.0 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j com.github.ben-manes.caffeine 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 550196caf0..8e395815bc 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 @@ -74,11 +74,6 @@ The following binary components are provided under the Apache Software License v This project contains annotations derived from JCIP-ANNOTATIONS Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Joda Time The following NOTICE information applies: This product includes software developed by diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index 0edc4f51da..a4133ebb82 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -243,6 +243,10 @@ com.google.guava guava + + org.slf4j + jcl-over-slf4j + org.apache.nifi nifi-mock diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 984a8587c3..8eb08abf86 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -194,6 +194,12 @@ org.apache.httpcomponents httpclient 4.5.5 + + + commons-logging + commons-logging + + org.apache.httpcomponents @@ -370,6 +376,10 @@ log4j log4j + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml index 84e12f9345..0c9d5d0da2 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/pom.xml @@ -91,6 +91,16 @@ org.apache.commons commons-dbcp2 2.7.0 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j org.apache.derby diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml index b03632bae7..e613af96d4 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/pom.xml @@ -64,6 +64,12 @@ org.apache.commons commons-dbcp2 2.7.0 + + + commons-logging + commons-logging + + @@ -81,8 +87,16 @@ log4j log4j + + commons-logging + commons-logging + + + org.slf4j + jcl-over-slf4j + org.apache.nifi 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 a09e396b1c..742cd00ced 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 @@ -150,11 +150,6 @@ Apache Software License v2 The following NOTICE information applies: Copyright 2006 Envoi Solutions LLC - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml index 97faa18816..bb7ec8457e 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/nifi-hbase_1_1_2-client-service/pom.xml @@ -94,6 +94,10 @@ com.google.code.findbugs jsr305 + + commons-logging + commons-logging + @@ -110,6 +114,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.nifi @@ -152,6 +160,10 @@ jdk.tools jdk.tools + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/src/main/resources/META-INF/NOTICE index 8f22074da0..5e826019fb 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/src/main/resources/META-INF/NOTICE @@ -155,11 +155,6 @@ Apache Software License v2 The following NOTICE information applies: Copyright 2006 Envoi Solutions LLC - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2016 The Apache Software Foundation - (ASLv2) Apache Commons Lang The following NOTICE information applies: Apache Commons Lang diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml index 32caf8adf3..342b3bfb2c 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/pom.xml @@ -91,6 +91,10 @@ com.google.code.findbugs jsr305 + + commons-logging + commons-logging + @@ -107,6 +111,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + org.apache.nifi @@ -149,6 +157,10 @@ jdk.tools jdk.tools + + commons-logging + commons-logging + diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/src/main/resources/META-INF/NOTICE index 08c8800e8f..3f73d46f0e 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/src/main/resources/META-INF/NOTICE @@ -70,11 +70,6 @@ The following binary components are provided under the Apache Software License v Original source copyright: Copyright (c) 2008 Alexander Beider & Stephen P. Morse. - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2013 The Apache Software Foundation - (ASLv2) Apache Commons Net The following NOTICE information applies: Apache Commons Net 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 ae17d2fc6a..44397c80e1 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 @@ -54,6 +54,12 @@ org.apache.commons commons-configuration2 2.7 + + + commons-logging + commons-logging + + org.apache.commons @@ -64,6 +70,12 @@ commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + com.maxmind.geoip2 @@ -74,8 +86,16 @@ com.google.code.findbugs jsr305 + + commons-logging + commons-logging + + + org.slf4j + jcl-over-slf4j + com.squareup.okhttp3 okhttp diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/pom.xml index cbf0891903..83fceb7837 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/pom.xml +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/pom.xml @@ -507,6 +507,16 @@ webdrivermanager 3.3.0 test + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j javax.servlet diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/NOTICE b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/NOTICE index c7336d0f47..e108405c54 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/NOTICE +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-assembly/NOTICE @@ -35,14 +35,6 @@ The following binary components are provided under the Apache Software License v contains test data from http://aspell.net/test/orig/batch0.tab. Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2016 The Apache Software Foundation - - This product includes software developed at - The Apache Software Foundation (https://www.apache.org/). - (ASLv2) Apache HttpComponents Client The following NOTICE information applies: Copyright 1999-2019 The Apache Software Foundation @@ -233,14 +225,6 @@ The following binary components are provided under the Apache Software License v * HOMEPAGE: * https://github.com/google/caliper - This product optionally depends on 'Apache Commons Logging', a logging - framework, which can be obtained at: - - * LICENSE: - * license/LICENSE.commons-logging.txt (Apache License 2.0) - * HOMEPAGE: - * https://commons.apache.org/logging/ - This product optionally depends on 'Apache Log4J', a logging framework, which can be obtained at: diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml index 72ca76eacf..7e7df66136 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-aws/nifi-registry-aws-extensions/pom.xml @@ -42,6 +42,16 @@ software.amazon.awssdk apache-client + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j org.mockito diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/NOTICE b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/NOTICE index d5d9969aa8..fe7d18a527 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/NOTICE +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-assembly/NOTICE @@ -74,11 +74,6 @@ Apache Software License v2 This product includes software from the Spring Framework, under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - (ASLv2) Apache Commons Logging - The following NOTICE information applies: - Apache Commons Logging - Copyright 2003-2014 The Apache Software Foundation - (ASLv2) Apache Commons Math The following NOTICE information applies: Apache Commons Math diff --git a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml index 4486152953..582a4b0fcd 100644 --- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml +++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/nifi-registry-ranger-plugin/pom.xml @@ -70,6 +70,10 @@ org.slf4j log4j-over-slf4j + + org.slf4j + jcl-over-slf4j + @@ -85,6 +89,10 @@ log4j log4j + + commons-logging + commons-logging + com.google.code.findbugs jsr305 @@ -115,6 +123,10 @@ log4j log4j + + commons-logging + commons-logging + @@ -130,6 +142,10 @@ org.slf4j slf4j-api + + commons-logging + commons-logging + @@ -159,6 +175,10 @@ org.apache.hadoop hadoop-mapreduce-client-jobclient + + commons-logging + commons-logging + commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + commons-cli diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml index cd048d5fe4..7c39ba3509 100644 --- a/nifi-toolkit/nifi-toolkit-cli/pom.xml +++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml @@ -121,6 +121,16 @@ com.opencsv opencsv 5.4 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml index fd1824d24e..8371804b38 100644 --- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml +++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml @@ -88,11 +88,23 @@ org.apache.commons commons-configuration2 2.7 + + + commons-logging + commons-logging + + commons-beanutils commons-beanutils 1.9.4 + + + commons-logging + commons-logging + + org.spockframework diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml b/nifi-toolkit/nifi-toolkit-tls/pom.xml index 786ec4fc45..8d584747c1 100644 --- a/nifi-toolkit/nifi-toolkit-tls/pom.xml +++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml @@ -86,6 +86,16 @@ org.apache.httpcomponents httpclient 4.5.5 + + + commons-logging + commons-logging + + + + + org.slf4j + jcl-over-slf4j diff --git a/pom.xml b/pom.xml index fa125142e4..f112ef1b79 100644 --- a/pom.xml +++ b/pom.xml @@ -785,6 +785,8 @@ log4j:log4j:* org.apache.logging.log4j:log4j-core:(,2.15.0) + + commons-logging:commons-logging:*