This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ee3dcc78bf58ff02af9351ac9593978b0b5cd0e4
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Tue Jun 28 14:29:13 2022 -0500
NIFI-10173 This closes #6164. Upgraded Flume from 1.6.0 to 1.10.0
- Removed unmaintained flume-dataset-sink and flume-ng-elasticsearch-sink
dependencies
- Added dependency-check suppression configuration for false positives on
Flume libraries
Signed-off-by: Joe Witt <joew...@apache.org>
---
nifi-dependency-check-maven/suppressions.xml | 30 ++++++++++++++++++++++
.../nifi-flume-processors/pom.xml | 22 +---------------
.../src/test/resources/log4j.properties | 22 ----------------
3 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/nifi-dependency-check-maven/suppressions.xml
b/nifi-dependency-check-maven/suppressions.xml
index a1f15c36d2..db3e58a794 100644
--- a/nifi-dependency-check-maven/suppressions.xml
+++ b/nifi-dependency-check-maven/suppressions.xml
@@ -99,4 +99,34 @@
<packageUrl
regex="true">^pkg:maven/org\.apache\.spark/spark\-.+?_2\.13@.*$</packageUrl>
<cpe>cpe:/a:apache:spark</cpe>
</suppress>
+ <suppress>
+ <notes>Apache Hive vulnerabilities do not apply to Flume Hive
Sink</notes>
+ <packageUrl
regex="true">^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-hive\-sink@.*$</packageUrl>
+ <cpe>cpe:/a:apache:hive</cpe>
+ </suppress>
+ <suppress>
+ <notes>Apache Kafka vulnerabilities do not apply to Flume Kafka
Sink</notes>
+ <packageUrl
regex="true">^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-ng\-kafka\-sink@.*$</packageUrl>
+ <cpe>cpe:/a:apache:kafka</cpe>
+ </suppress>
+ <suppress>
+ <notes>Apache Kafka vulnerabilities do not apply to Flume Kafka
Source</notes>
+ <packageUrl
regex="true">^pkg:maven/org\.apache\.flume\.flume\-ng\-sources/flume\-kafka\-source@.*$</packageUrl>
+ <cpe>cpe:/a:apache:kafka</cpe>
+ </suppress>
+ <suppress>
+ <notes>Apache Kafka vulnerabilities do not apply to Flume Shared
Kafka</notes>
+ <packageUrl
regex="true">^pkg:maven/org\.apache\.flume\.flume\-shared/flume\-shared\-kafka@.*$</packageUrl>
+ <cpe>cpe:/a:apache:kafka</cpe>
+ </suppress>
+ <suppress>
+ <notes>Apache HBase vulnerabilities do not apply to Flume HBase
Sink</notes>
+ <packageUrl
regex="true">^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-ng\-hbase\-sink@.*$</packageUrl>
+ <cpe>cpe:/a:apache:hbase</cpe>
+ </suppress>
+ <suppress>
+ <notes>Apache Solr vulnerabilities do not apply to Flume Solr
Sink</notes>
+ <packageUrl
regex="true">^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-ng\-morphline\-solr\-sink@.*$</packageUrl>
+ <cpe>cpe:/a:apache:solr</cpe>
+ </suppress>
</suppressions>
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 e5d32f3d80..36c7141970 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
@@ -24,7 +24,7 @@
<packaging>jar</packaging>
<properties>
- <flume.version>1.6.0</flume.version>
+ <flume.version>1.10.0</flume.version>
</properties>
<dependencies>
@@ -96,21 +96,6 @@
</dependency>
<!-- Flume Sinks -->
- <dependency>
- <groupId>org.apache.flume.flume-ng-sinks</groupId>
- <artifactId>flume-dataset-sink</artifactId>
- <version>${flume.version}</version>
- <exclusions>
- <exclusion>
- <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>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -173,11 +158,6 @@
<artifactId>flume-irc-sink</artifactId>
<version>${flume.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.flume.flume-ng-sinks</groupId>
- <artifactId>flume-ng-elasticsearch-sink</artifactId>
- <version>${flume.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.flume.flume-ng-sinks</groupId>
<artifactId>flume-ng-hbase-sink</artifactId>
diff --git
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/test/resources/log4j.properties
b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/test/resources/log4j.properties
deleted file mode 100644
index cc58727fa0..0000000000
---
a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-log4j.rootLogger=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x \u2013
%m%n
-
-log4j.logger.org.apache.flume = DEBUG
\ No newline at end of file
