You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2018/10/12 19:57:46 UTC
nifi git commit: NIFI-5665 - Changed netty versions to more closely
match the original netty dependency version. NIFI-5665 - Fixed version for
nifi-spark-bundle. NIFI-5665 - Fixing copy and paste error.
Repository: nifi
Updated Branches:
refs/heads/master 02e0a16a6 -> 5eb5e96b1
NIFI-5665 - Changed netty versions to more closely match the original netty dependency version.
NIFI-5665 - Fixed version for nifi-spark-bundle.
NIFI-5665 - Fixing copy and paste error.
This closes #3067
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5eb5e96b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5eb5e96b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5eb5e96b
Branch: refs/heads/master
Commit: 5eb5e96b1621d87bf8cca96d18a2c36177a1f54e
Parents: 02e0a16
Author: thenatog <th...@gmail.com>
Authored: Mon Oct 8 12:58:20 2018 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Oct 12 15:56:52 2018 -0400
----------------------------------------------------------------------
nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 6 ++++++
.../nifi-extension-utils/nifi-record-utils/pom.xml | 10 ++++++++++
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 6 ++++++
nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml | 10 ++++++++++
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 11 +++++++++++
nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 6 ++++++
nifi-nar-bundles/nifi-kite-bundle/pom.xml | 6 ++++++
.../nifi-parquet-bundle/nifi-parquet-processors/pom.xml | 1 -
nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 11 ++++++++++-
nifi-nar-bundles/nifi-riemann-bundle/pom.xml | 6 ++++++
nifi-nar-bundles/nifi-spark-bundle/pom.xml | 7 ++++++-
.../nifi-hbase_1_1_2-client-service-bundle/pom.xml | 6 ++++++
nifi-toolkit/pom.xml | 7 +++++++
13 files changed, 90 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index e4db5a6..d831f25 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -37,6 +37,12 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-atlas-reporting-task</artifactId>
<version>1.8.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
index d516ba4..985b25f 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
@@ -30,4 +30,14 @@
<module>nifi-mock-record-utils</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 77de2db..f0297f8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -601,6 +601,12 @@
<artifactId>commons-net</artifactId>
<version>3.6</version>
</dependency>
+ <dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
index 77716ee..26e3750 100644
--- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml
@@ -26,4 +26,14 @@
<modules>
<module>nifi-hadoop-libraries-nar</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index c67a267..eca835a 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -35,6 +35,17 @@
<module>nifi-hive3-nar</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<properties>
<hive.version>1.2.1</hive.version>
<hive.hadoop.version>2.6.2</hive.hadoop.version>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
index 04790c8..8728fe1 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
@@ -77,6 +77,12 @@
<artifactId>nifi-kafka-2-0-processors</artifactId>
<version>1.8.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-kite-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kite-bundle/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/pom.xml
index e566c23..9911b85 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kite-bundle/pom.xml
@@ -38,6 +38,12 @@
<artifactId>nifi-kite-processors</artifactId>
<version>1.8.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.6.9.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml
----------------------------------------------------------------------
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 57eed83..c8aa0ed 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
@@ -82,7 +82,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml
index 0ed219a..ad80dc4 100644
--- a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml
@@ -31,5 +31,14 @@
<module>nifi-parquet-processors</module>
<module>nifi-parquet-nar</module>
</modules>
-
+ <dependencyManagement>
+ <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
+ <dependencies>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.6.9.Final</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-riemann-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-riemann-bundle/pom.xml b/nifi-nar-bundles/nifi-riemann-bundle/pom.xml
index 8f0f8b2..42532f7 100644
--- a/nifi-nar-bundles/nifi-riemann-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-riemann-bundle/pom.xml
@@ -44,6 +44,12 @@
<artifactId>nifi-riemann-processors</artifactId>
<version>1.8.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.6.9.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-spark-bundle/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
index 322b112..70b569a 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-spark-bundle/pom.xml
@@ -63,6 +63,12 @@
<artifactId>jersey-client</artifactId>
<version>1.19.1</version>
</dependency>
+ <dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -81,6 +87,5 @@
<artifactId>nifi-processor-utils</artifactId>
<version>1.8.0-SNAPSHOT</version>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
index 0b16b47..c428f12 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
@@ -82,6 +82,12 @@
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <!-- Explicitly force Netty to 3.6.9 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.6.9.Final</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
http://git-wip-us.apache.org/repos/asf/nifi/blob/5eb5e96b/nifi-toolkit/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-toolkit/pom.xml b/nifi-toolkit/pom.xml
index 12eae22..dee8b96 100644
--- a/nifi-toolkit/pom.xml
+++ b/nifi-toolkit/pom.xml
@@ -47,7 +47,14 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <!-- Explicitly force Netty to 3.7.1 due to CVE-2014-0193 -->
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ <version>3.7.1.Final</version>
+ </dependency>
</dependencies>
+
</dependencyManagement>
<dependencies>
<dependency>