You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2021/12/20 17:43:24 UTC
[nifi] branch support/nifi-1.15 updated (d9bc4c0 -> 91f5cc3)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a change to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git.
from d9bc4c0 NIFI-9480
new e643011 NIFI-9495 Corrected BulletinMergerTest using static timestamps
new 283d2ee NIFI-9491 Excluded commons-logging and added jcl-over-slf4j references
new ba8ad3c NIFI-9497 Upgraded Bouncy Castle from 1.69 to 1.70
new abc45ac NIFI-9504 Upgraded Logback from 1.2.8 to 1.2.9
new 91f5cc3 NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related libraries
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
minifi/minifi-assembly/NOTICE | 5 --
minifi/minifi-c2/minifi-c2-assembly/NOTICE | 5 --
.../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 12 +++-
.../src/main/resources/META-INF/NOTICE | 5 --
.../minifi-toolkit/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 | 27 +++++--
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-bundle/nifi-aws-processors/pom.xml | 10 +++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-aws-bundle/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-bundle/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 | 83 +++++-----------------
nifi-nar-bundles/nifi-druid-bundle/pom.xml | 80 +++++++++++++++++++++
.../nifi-easyrules-service/pom.xml | 10 +++
.../src/main/resources/META-INF/NOTICE | 18 -----
.../nifi-elasticsearch-5-processors/pom.xml | 3 +-
.../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-extension-utils/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/cluster/manager/BulletinMergerTest.java | 77 +++++++++++---------
.../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-bundle/nifi-gcp-processors/pom.xml | 29 +++++++-
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-gcp-bundle/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-bundle/nifi-hive-processors/pom.xml | 26 +++++++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 60 ++++++++++++++++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-hive_1_1-processors/pom.xml | 26 +++++++
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 10 +++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-ignite-processors/pom.xml | 8 ++-
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-jms-bundle/nifi-jms-processors/pom.xml | 5 +-
.../nifi-kite-bundle/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-bundle/nifi-poi-processors/pom.xml | 10 +++
.../nifi-prometheus-reporting-task/pom.xml | 22 ++++--
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 37 ++++++++++
.../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-bundle/nifi-solr-processors/pom.xml | 14 ++--
.../nifi-livy-controller-service-api/pom.xml | 10 +++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-spark-bundle/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 | 37 ++++++++++
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/nifi-toolkit-encrypt-config/pom.xml | 12 ++++
nifi-toolkit/nifi-toolkit-tls/pom.xml | 10 +++
pom.xml | 14 ++--
116 files changed, 935 insertions(+), 490 deletions(-)
[nifi] 03/05: NIFI-9497 Upgraded Bouncy Castle from 1.69 to 1.70
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ba8ad3c17cd335f7654e276a22febd95a8c9e650
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Dec 17 08:19:13 2021 -0600
NIFI-9497 Upgraded Bouncy Castle from 1.69 to 1.70
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #5610.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f112ef1..21152ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<inceptionYear>2014</inceptionYear>
<okhttp.version>4.9.2</okhttp.version>
- <org.bouncycastle.version>1.69</org.bouncycastle.version>
+ <org.bouncycastle.version>1.70</org.bouncycastle.version>
<org.slf4j.version>1.7.32</org.slf4j.version>
<ranger.version>2.1.0</ranger.version>
<jetty.version>9.4.44.v20210927</jetty.version>
[nifi] 04/05: NIFI-9504 Upgraded Logback from 1.2.8 to 1.2.9
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit abc45ac67f5dbc49eb0c7567a493c90ee350055c
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Sat Dec 18 14:30:06 2021 -0600
NIFI-9504 Upgraded Logback from 1.2.8 to 1.2.9
NIFI-9505 Upgraded Log4j 2 from 2.16.0 to 2.17.0
Signed-off-by: Chris Sampson <ch...@gmail.com>
This closes #5615
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21152ae..6cf5ad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<gcs.version>2.1.5</gcs.version>
<aspectj.version>1.9.6</aspectj.version>
<jersey.version>2.33</jersey.version>
- <logback.version>1.2.8</logback.version>
+ <logback.version>1.2.9</logback.version>
<mockito.version>3.11.2</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version>
<netty.4.version>4.1.69.Final</netty.4.version>
@@ -484,11 +484,11 @@
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
</dependency>
- <!-- Override log4j-core and related Log4j 2 libraries for transitive dependencies to address CVE-2021-44228 -->
+ <!-- Override log4j-core and related Log4j 2 libraries for transitive dependencies to multiple vulnerabilities -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
- <version>2.16.0</version>
+ <version>2.17.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -783,8 +783,8 @@
<exclude>com.google.code.findbugs:jsr305:*:*:compile</exclude>
<!-- Log4J excluded in favor of log4j-over-slf4j and logback -->
<exclude>log4j:log4j:*</exclude>
- <!-- Ban log4j-core less than 2.15.0 due to Log4Shell vulnerability -->
- <exclude>org.apache.logging.log4j:log4j-core:(,2.15.0)</exclude>
+ <!-- Ban log4j-core less than 2.17.0 due to multiple vulnerability -->
+ <exclude>org.apache.logging.log4j:log4j-core:(,2.17.0)</exclude>
<!-- Commons Logging excluded in favor of jcl-over-slf4j -->
<exclude>commons-logging:commons-logging:*</exclude>
</excludes>
[nifi] 02/05: NIFI-9491 Excluded commons-logging and added jcl-over-slf4j references
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 283d2ee3751956d5fdc6be7965dcbe4f99787930
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Wed Dec 15 16:47:44 2021 -0600
NIFI-9491 Excluded commons-logging and added jcl-over-slf4j references
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #5608
---
minifi/minifi-assembly/NOTICE | 5 --
minifi/minifi-c2/minifi-c2-assembly/NOTICE | 5 --
.../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 12 +++-
.../src/main/resources/META-INF/NOTICE | 5 --
.../minifi-toolkit/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-bundle/nifi-aws-processors/pom.xml | 10 +++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-aws-bundle/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-bundle/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-extension-utils/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-bundle/nifi-gcp-processors/pom.xml | 29 +++++++-
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-gcp-bundle/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-bundle/nifi-hive-processors/pom.xml | 26 +++++++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 34 +++++++++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-hive_1_1-processors/pom.xml | 26 +++++++
.../nifi-hl7-bundle/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-bundle/nifi-jms-processors/pom.xml | 5 +-
.../nifi-kite-bundle/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-bundle/nifi-poi-processors/pom.xml | 10 +++
.../nifi-prometheus-reporting-task/pom.xml | 22 ++++--
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-ranger-bundle/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-bundle/nifi-solr-processors/pom.xml | 6 --
.../nifi-livy-controller-service-api/pom.xml | 10 +++
.../src/main/resources/META-INF/NOTICE | 5 --
.../nifi-spark-bundle/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/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 422185c..86c9da3 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 fc7727f..8dbf0ee 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 4a0b36d..3bb0fd1 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.
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws.sdk.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
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 3619913..6b42cc2 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 5cb578c..7b41748 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 baa8552..13ce4c6 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 219960e..a3681d4 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 29526dc..d101524 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
@@ -42,6 +42,10 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
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 ea93e7d..5af459a 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
@@ -35,6 +35,10 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
index 59cdb3b..ec3a743 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
@@ -53,6 +53,12 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -72,6 +78,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
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 1e96d81..bb0ab15 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 7a600fc..2391532 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
@@ -35,6 +35,10 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-processor-utils</artifactId>
<version>1.15.2-SNAPSHOT</version>
@@ -59,17 +63,17 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-client-v2</artifactId>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.atlas</groupId>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index 9831b7e..8fc9ce0 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -52,6 +52,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -67,6 +75,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
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 52bb924..7aefb47 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 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
@@ -51,6 +41,16 @@
<groupId>com.amazonaws</groupId>
<artifactId>amazon-kinesis-client</artifactId>
<version>${aws-kinesis-client-library-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
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 9c5499f..6c7a90a 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 @@
<artifactId>nifi-aws-parameter-value-providers</artifactId>
<version>1.15.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
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 b67581f..b7761af 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 a151a80..38d72f9 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 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
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 f12ab6f..0c03647 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 8d6ba76..3ad6c2d 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 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-cbor</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index a463636..68c50a6 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -41,6 +41,25 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-core</artifactId>
+ <version>${aws-java-sdk-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-cbor</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
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 89e320b..9e3c0f4 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 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<!-- test dependencies -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index a9b549c..7181bf9 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -97,6 +97,17 @@
<artifactId>commons-text</artifactId>
<version>1.8</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.13</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
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 4307bc8..6bd6684 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 789199b..2d9d2aa 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 5d0ad5c..f2261ad 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 7c8884b..d053886 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 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
<version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.openehealth.ipf.oht.mdht</groupId>
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 ea16d07..6e91d28 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 8ef18f6..8f09169 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,9 +62,17 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
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 6a9ebf8..1204545 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 efa0f0c..d8fa63b 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 @@
<dependency>
<groupId>io.druid</groupId>
<artifactId>tranquility-core_2.11</artifactId>
- <exclusions>
- <exclusion>
- <groupId>io.druid</groupId>
- <artifactId>druid-console</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.druid</groupId>
- <artifactId>druid-aws-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.tesla.aether</groupId>
- <artifactId>tesla-aether</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.maxmind.geoip2</groupId>
- <artifactId>geoip2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.druid</groupId>
- <artifactId>druid-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.druid</groupId>
@@ -112,20 +54,6 @@
<groupId>io.druid</groupId>
<artifactId>druid-processing</artifactId>
<version>${druid.version}</version>
- <exclusions>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.airlift</groupId>
- <artifactId>airline</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
@@ -141,5 +69,9 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
\ 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 92ac905..5a2e43e 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
@@ -36,11 +36,91 @@
<groupId>io.druid</groupId>
<artifactId>tranquility-core_2.11</artifactId>
<version>${tranquility.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.druid</groupId>
+ <artifactId>druid-console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.druid</groupId>
+ <artifactId>druid-aws-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.tesla.aether</groupId>
+ <artifactId>tesla-aether</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.maxmind.geoip2</groupId>
+ <artifactId>geoip2</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.druid</groupId>
+ <artifactId>druid-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.druid</groupId>
<artifactId>druid-processing</artifactId>
<version>${druid.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.airlift</groupId>
+ <artifactId>airline</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Override commons-io:2.4 from druid -->
<dependency>
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 c83e0d4..07eb343 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 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
<version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
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 c0a652e..8931a19 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 427a8aa..c844811 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 d14d885..fa67da2 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 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
@@ -134,6 +137,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.13</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -152,6 +161,10 @@
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
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 e0b733f..baa0c94 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 4382bae..30b45af 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 221a1820..58c9f37 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 @@
<groupId>com.microsoft.ews-java-api</groupId>
<artifactId>ews-java-api</artifactId>
<version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
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 72c30d1..9c0802d 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 6131ebc..5eb0e9a 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,9 +48,17 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.github.stephenc.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
<version>1.3.9-1</version>
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 6ae0c3b..49949e4 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 @@
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- Other modules using nifi-hadoop-utils are expected to have the below dependencies available, typically through a NAR dependency -->
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -67,6 +71,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -83,6 +91,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -90,6 +102,12 @@
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Test dependencies -->
<dependency>
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 fcdad9f..b01be92 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,9 +70,17 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-service-api</artifactId>
</dependency>
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 fbb48a1..3f1209f 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 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -101,6 +105,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -129,6 +137,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -141,6 +153,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
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 6a77e4c..1aca0f0 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 7fd62c6..c32c6ef 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 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
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 a2e5392..87bce53 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 1147769..76345bc 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 8f1fe28..3ca95f7 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 c3ff194..81bccca 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,10 +84,33 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-bigquery</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsub</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.cloud</groupId>
+ <artifactId>google-cloud-pubsublite</artifactId>
+ <version>1.3.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.tdunning</groupId>
@@ -95,6 +118,10 @@
<version>1.8</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-json-utils</artifactId>
<version>1.15.2-SNAPSHOT</version>
@@ -152,4 +179,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
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 0a42bf8..0146cca 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 f8ede7c..ba1115d 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,9 +38,26 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.0.1-jre</version>
+ </dependency>
+ <dependency>
<groupId>com.github.stephenc.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
<version>1.3.9-1</version>
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 c9eff4c..2f50fff 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,6 +104,12 @@
<groupId>org.janusgraph</groupId>
<artifactId>janusgraph-core</artifactId>
<version>0.5.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.janusgraph</groupId>
@@ -111,6 +117,10 @@
<version>0.5.3</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
</dependency>
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 bb2b72c..95cad83 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 9fd747c..6b3e063 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 aea5fdc..ce543d6 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 3399b80..716ba6a 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 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -68,6 +72,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -77,6 +85,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
</dependency>
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 14cea4c..f2eae37 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,6 +42,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -49,6 +53,10 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
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 2f27715..dde0af6 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 d3c6205..cd4b488 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 615f1c3..5122b5e 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 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -103,6 +107,10 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Override groovy-all:2.1.6 from Hive -->
@@ -120,6 +128,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -139,6 +151,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -165,12 +181,22 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
<version>1.15.2-SNAPSHOT</version>
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 daeb357..642395d 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 af7a573..6af7bd3 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 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -107,6 +111,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -158,6 +166,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hadoop-common</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -189,6 +205,10 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -204,6 +224,10 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Override groovy-all:2.4.11 from Hive -->
@@ -238,12 +262,22 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<scope>test</scope>
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 aef18f2..e09c83e 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 8573648..778c028 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 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -113,6 +117,10 @@
<groupId>log4j</groupId>
<artifactId>apache-log4j-extras</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -124,6 +132,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -147,6 +159,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -173,12 +189,22 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
<version>1.15.2-SNAPSHOT</version>
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 eea8865..d558fbf 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 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>ca.uhn.hapi</groupId>
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 776adc5..76fd48e 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 5143b4d..51d5e01 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 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-spring</artifactId>
<version>1.6.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
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 76e393d..c027d8e 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 4ef9492..2680f64 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 @@
<version>${spring.version}</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
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 c0c7809..833170f 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 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -103,6 +107,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -200,6 +208,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -212,6 +224,10 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<dependency>
<!-- avoid warnings by bundling annotations -->
@@ -311,6 +327,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
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 1ebd79b..fe2b8c3 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 a56a135..c2a531e 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 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
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 1137e76..af29be5 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 463eb04..b1b545d 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
@@ -34,6 +34,10 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
<version>1.15.2-SNAPSHOT</version>
@@ -56,6 +60,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
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 7342945..46e04f5 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 @@
<groupId>de.rototor.pdfbox</groupId>
<artifactId>graphics2d</artifactId>
<version>0.32</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
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 569f081..38200e5 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 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.3</version>
- <scope>test</scope>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.3</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
-</dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
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 825f5b4..c116781 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 804e342..daf2c5b 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
@@ -41,6 +41,10 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.ranger</groupId>
<artifactId>ranger-plugins-common</artifactId>
<version>${ranger.version}</version>
@@ -57,6 +61,10 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -72,6 +80,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -87,6 +99,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -104,6 +120,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- hadoop-common and hadoop-auth are transitive dependencies of ranger client, but we need to make sure they
@@ -125,6 +145,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -145,6 +169,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/pom.xml
index 9333b55..2341066 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-resources/pom.xml
@@ -47,12 +47,26 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/src/main/resources/META-INF/NOTICE
index c836e4f..a3b653b 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-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-slack-bundle/nifi-slack-processors/pom.xml b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
index 90d0200..e49584d 100644
--- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-processors/pom.xml
@@ -40,6 +40,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -47,6 +53,10 @@
<version>4.5.7</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
</dependency>
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
index a54bfa4..19e5518 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/src/main/resources/META-INF/NOTICE
@@ -35,11 +35,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) JOAuth
The following NOTICE information applies:
JOAuth
diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
index 42d7c71..7814fe8 100644
--- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-twitter-processors/pom.xml
@@ -48,9 +48,17 @@
<groupId>org.twitter4j</groupId>
<artifactId>twitter4j-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.github.stephenc.findbugs</groupId>
<artifactId>findbugs-annotations</artifactId>
<version>1.3.9-1</version>
diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
index de6c4fd..ff6db91 100755
--- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
@@ -113,12 +113,6 @@
<version>1.15.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
<!-- Need to declare the newer versions of these b/c NiFi uses Lucene 4.10.3 -->
<dependency>
<groupId>org.apache.solr</groupId>
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 e1b77e6..259e7ef 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 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
</project>
\ 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 ecde2d0..aeace6f 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 d073f7f..ba19939 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
@@ -39,6 +39,10 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</dependency>
diff --git a/nifi-nar-bundles/nifi-spark-bundle/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
index 378f945..2b352f0 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
@@ -52,6 +52,12 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
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 146ff48..aa94e03 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
@@ -60,12 +60,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-core</artifactId>
<version>${spring.integration.version}</version>
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 2487232..e4218b8 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 a79a2ff..b928027 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 @@
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>1.21.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
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 550196c..8e39581 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 0edc4f5..a4133eb 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
@@ -244,6 +244,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
<version>1.15.2-SNAPSHOT</version>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 984a858..8eb08ab 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -194,6 +194,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -370,6 +376,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
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 84e12f9..0c9d5d0 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 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
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 b03632b..e613af9 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 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- We are compiling against hadoop-common to make use of UserGroupInformation, but we don't want to bundle it
into the NAR, users are expected to provided hadoop-common on the driver classpath, or a shaded JAR that includes it -->
@@ -81,8 +87,16 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.apache.nifi</groupId>
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 a09e396..742cd00 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 97faa18..bb7ec84 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 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -110,6 +114,10 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -152,6 +160,10 @@
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
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 8f22074..5e82601 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 32caf8a..342b3bf 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 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -107,6 +111,10 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -149,6 +157,10 @@
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
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 08c8800..3f73d46 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 ae17d2f..44397c8 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 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -64,6 +70,12 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.maxmind.geoip2</groupId>
@@ -74,9 +86,17 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
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 cbf0891..83fceb7 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 @@
<artifactId>webdrivermanager</artifactId>
<version>3.3.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
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 c7336d0..e108405 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 72ca76e..7e7df66 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 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
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 d5d9969..fe7d18a 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 4486152..582a4b0 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 @@
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
<!-- Ranger dependencies -->
<dependency>
@@ -86,6 +90,10 @@
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
@@ -115,6 +123,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -130,6 +142,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -159,6 +175,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- hadoop-common and hadoop-auth are transitive dependencies of ranger client, but we need to make sure they
@@ -194,6 +214,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -209,6 +233,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/nifi-stateless/nifi-stateless-assembly/NOTICE b/nifi-stateless/nifi-stateless-assembly/NOTICE
index 9074edb..cc2f618 100644
--- a/nifi-stateless/nifi-stateless-assembly/NOTICE
+++ b/nifi-stateless/nifi-stateless-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-stateless/nifi-stateless-bundle/nifi-stateless-nar/src/main/resources/META-INF/NOTICE b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-nar/src/main/resources/META-INF/NOTICE
index 1dffbee..03016ba 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-nar/src/main/resources/META-INF/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-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml
index c320e8c..af44de7 100644
--- a/nifi-toolkit/nifi-toolkit-admin/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml
@@ -25,6 +25,12 @@ language governing permissions and limitations under the License. -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml
index cd048d5..7c39ba3 100644
--- a/nifi-toolkit/nifi-toolkit-cli/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml
@@ -121,6 +121,16 @@
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>5.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
index fd1824d..8371804 100644
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml
@@ -88,11 +88,23 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
<version>2.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml b/nifi-toolkit/nifi-toolkit-tls/pom.xml
index 786ec4f..8d58474 100644
--- a/nifi-toolkit/nifi-toolkit-tls/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml
@@ -86,6 +86,16 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index fa12514..f112ef1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -785,6 +785,8 @@
<exclude>log4j:log4j:*</exclude>
<!-- Ban log4j-core less than 2.15.0 due to Log4Shell vulnerability -->
<exclude>org.apache.logging.log4j:log4j-core:(,2.15.0)</exclude>
+ <!-- Commons Logging excluded in favor of jcl-over-slf4j -->
+ <exclude>commons-logging:commons-logging:*</exclude>
</excludes>
<includes>
<!-- Versions of JSR305 after 3.0.1 are allowed https://github.com/findbugsproject/findbugs/issues/128 -->
[nifi] 05/05: NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related libraries
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 91f5cc3763c08c035d4474a035054091bd9a3c06
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Sat Dec 18 18:23:31 2021 -0600
NIFI-9483 This closes #5616. Excluded Log4j 2 log4j-core and related libraries
- Added log4j-core to list of banned dependencies
- Added log4j-to-slf4j for Elasticsearch 5 processors to support runtime logging
Signed-off-by: Joe Witt <jo...@apache.org>
---
.../nifi-atlas-reporting-task/pom.xml | 11 +++++++++
.../nifi-druid-controller-service-api/pom.xml | 23 +++++++++++++++++++
.../nifi-elasticsearch-5-processors/pom.xml | 3 ++-
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 26 ++++++++++++++++++++++
.../nifi-ignite-processors/pom.xml | 2 +-
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 9 ++++++++
.../nifi-solr-bundle/nifi-solr-processors/pom.xml | 8 +++++++
.../nifi-registry-ranger-plugin/pom.xml | 9 ++++++++
pom.xml | 4 ++--
9 files changed, 91 insertions(+), 4 deletions(-)
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 2391532..5173d38 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
@@ -78,6 +78,17 @@
<dependency>
<groupId>org.apache.atlas</groupId>
<artifactId>atlas-notification</artifactId>
+ <exclusions>
+ <!-- Exclude Log4j 2 only referenced in optional FailedMessagesLogger -->
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
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 d8fa63b..8dd351c 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
@@ -54,6 +54,29 @@
<groupId>io.druid</groupId>
<artifactId>druid-processing</artifactId>
<version>${druid.version}</version>
+ <exclusions>
+ <!-- Exclude Log4j 2 libraries since Druid common Logger uses SLF4J -->
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jul</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.github.stephenc.findbugs</groupId>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
index a34d173..dcda8be 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml
@@ -77,13 +77,14 @@ language governing permissions and limitations under the License. -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
+ <!-- Route Elasticsearch Log4j 2 logging to SLF4J -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
+ <artifactId>log4j-to-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
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 6af7bd3..3d40ad4 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
@@ -99,6 +99,19 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <!-- Exclude Log4j 2 since Hive 3 uses SLF4J in component classes -->
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -112,9 +125,22 @@
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <!-- Exclude Log4j 2 since Hive 3 uses SLF4J in component classes -->
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
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 51d5e01..04923c5 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
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-log4j2</artifactId>
+ <artifactId>ignite-slf4j</artifactId>
<version>1.6.0</version>
<scope>test</scope>
</dependency>
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 daf2c5b..533701c 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
@@ -84,6 +84,15 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <!-- Exclude Log4j 2 since Ranger does not include direct references to Log4j Loggers -->
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
index ff6db91..818f520 100755
--- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml
@@ -123,6 +123,14 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
<scope>test</scope>
</dependency>
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 582a4b0..71e3cc4 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
@@ -127,6 +127,15 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <!-- Exclude Log4j 2 since Ranger does not include direct references to Log4j Loggers -->
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 6cf5ad3..0be303a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -783,8 +783,8 @@
<exclude>com.google.code.findbugs:jsr305:*:*:compile</exclude>
<!-- Log4J excluded in favor of log4j-over-slf4j and logback -->
<exclude>log4j:log4j:*</exclude>
- <!-- Ban log4j-core less than 2.17.0 due to multiple vulnerability -->
- <exclude>org.apache.logging.log4j:log4j-core:(,2.17.0)</exclude>
+ <!-- Log4j 2 log4j-core excluded in favor of log4j-to-slf4j routing to logback -->
+ <exclude>org.apache.logging.log4j:log4j-core:*</exclude>
<!-- Commons Logging excluded in favor of jcl-over-slf4j -->
<exclude>commons-logging:commons-logging:*</exclude>
</excludes>
[nifi] 01/05: NIFI-9495 Corrected BulletinMergerTest using static timestamps
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.15
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e6430115e59716325ba13aa41f94f018dd2238fd
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Thu Dec 16 13:56:44 2021 -0600
NIFI-9495 Corrected BulletinMergerTest using static timestamps
- Replaced JUnit 4 and TestNG references with JUnit 5
- Added test method for bulletin sorting
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #5607
---
.../nifi/cluster/manager/BulletinMergerTest.java | 77 +++++++++++++---------
1 file changed, 45 insertions(+), 32 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
index cb0d181..5b79d27 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/java/org/apache/nifi/cluster/manager/BulletinMergerTest.java
@@ -19,68 +19,81 @@ package org.apache.nifi.cluster.manager;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.web.api.dto.BulletinDTO;
import org.apache.nifi.web.api.entity.BulletinEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.Date;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static org.apache.nifi.cluster.manager.BulletinMerger.ALL_NODES_MESSAGE;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class BulletinMergerTest {
+ private static final Date FIRST_TIMESTAMP = new Date(86400);
- long bulletinId = 0;
+ private static final Date SECOND_TIMESTAMP = new Date(178000);
- private BulletinEntity createBulletin(final String message) {
+ private static final NodeIdentifier FIRST_NODE = new NodeIdentifier("node-1", "host-1", 8080, "host-address-1", 8888, null, null, null, false);
+
+ private static final NodeIdentifier SECOND_NODE = new NodeIdentifier("node-2", "host-2", 8080, "host-address-2", 8888, null, null, null, false);
+
+ private long bulletinId = 0;
+
+ private BulletinEntity createBulletin(final String message, final Date timestamp, final boolean readable) {
final BulletinDTO bulletin = new BulletinDTO();
bulletin.setId(bulletinId++);
bulletin.setMessage(message);
- bulletin.setTimestamp(new Date());
+ bulletin.setTimestamp(timestamp);
final BulletinEntity entity = new BulletinEntity();
entity.setId(bulletin.getId());
entity.setTimestamp(bulletin.getTimestamp());
- entity.setCanRead(true);
+ entity.setCanRead(readable);
entity.setBulletin(bulletin);
return entity;
}
@Test
- public void mergeBulletins() throws Exception {
- final BulletinEntity bulletinEntity1 = createBulletin("This is bulletin 1");
- final BulletinEntity bulletinEntity2 = createBulletin("This is bulletin 2");
-
- final BulletinEntity unauthorizedBulletin = new BulletinEntity();
- unauthorizedBulletin.setId(bulletinId++);
- unauthorizedBulletin.setTimestamp(new Date());
- unauthorizedBulletin.setCanRead(false);
-
- final BulletinEntity copyOfBulletin1 = createBulletin("This is bulletin 1");
-
- final NodeIdentifier node1 = new NodeIdentifier("node-1", "host-1", 8080, "host-1", 19998, null, null, null, false);
- final NodeIdentifier node2 = new NodeIdentifier("node-2", "host-2", 8081, "host-2", 19999, null, null, null, false);
+ public void testMergeBulletins() {
+ final BulletinEntity bulletinEntity1 = createBulletin("This is bulletin 1", FIRST_TIMESTAMP, true);
+ final BulletinEntity bulletinEntity2 = createBulletin("This is bulletin 2", FIRST_TIMESTAMP,true);
+ final BulletinEntity unauthorizedBulletin = createBulletin("Protected Bulletin", FIRST_TIMESTAMP, false);
+ final List<BulletinEntity> bulletins = Arrays.asList(bulletinEntity1, bulletinEntity2, unauthorizedBulletin);
final Map<NodeIdentifier, List<BulletinEntity>> nodeMap = new LinkedHashMap<>();
- nodeMap.put(node1, new ArrayList<>());
- nodeMap.put(node2, new ArrayList<>());
+ nodeMap.put(FIRST_NODE, bulletins);
+ nodeMap.put(SECOND_NODE, Collections.singletonList(bulletinEntity1));
- nodeMap.get(node1).add(bulletinEntity1);
- nodeMap.get(node1).add(bulletinEntity2);
- nodeMap.get(node1).add(unauthorizedBulletin);
+ final List<BulletinEntity> merged = BulletinMerger.mergeBulletins(nodeMap, nodeMap.size());
- nodeMap.get(node2).add(copyOfBulletin1);
+ assertEquals(merged.size(), bulletins.size());
+ assertTrue(merged.contains(bulletinEntity1), "First Bulletin not found");
+ assertTrue(merged.contains(bulletinEntity2), "Second Bulletin not found");
+ assertTrue(merged.contains(unauthorizedBulletin), "Protected Bulletin not found");
- final List<BulletinEntity> bulletinEntities = BulletinMerger.mergeBulletins(nodeMap, nodeMap.size());
- assertEquals(bulletinEntities.size(), 3);
- assertTrue(bulletinEntities.contains(bulletinEntity1));
assertEquals(bulletinEntity1.getNodeAddress(), ALL_NODES_MESSAGE);
- assertTrue(bulletinEntities.contains(bulletinEntity2));
- assertTrue(bulletinEntities.contains(unauthorizedBulletin));
}
+ @Test
+ public void testMergeBulletinsSortedOldestNewest() {
+ final BulletinEntity newerBulletin = createBulletin("Second Message", SECOND_TIMESTAMP, true);
+ final BulletinEntity olderBulletin = createBulletin("First Message", FIRST_TIMESTAMP, true);
+ final List<BulletinEntity> bulletins = Arrays.asList(newerBulletin, olderBulletin);
+
+ final Map<NodeIdentifier, List<BulletinEntity>> nodeMap = new LinkedHashMap<>();
+ nodeMap.put(FIRST_NODE, bulletins);
+
+ final List<BulletinEntity> merged = BulletinMerger.mergeBulletins(nodeMap, nodeMap.size());
+ assertEquals(merged.size(), bulletins.size());
+
+ final Iterator<BulletinEntity> mergedBulletins = merged.iterator();
+ assertEquals(olderBulletin, mergedBulletins.next(), "Older Bulletin not matched");
+ assertEquals(newerBulletin, mergedBulletins.next(), "Newer Bulletin not matched");
+ }
}