This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new e269304e23 NIFI-12943 Upgraded Hadoop from 3.3.6 to 3.4.0 e269304e23 is described below commit e269304e23abd9710f6a73ea670a318b3e305f73 Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Mon Mar 25 09:06:27 2024 -0500 NIFI-12943 Upgraded Hadoop from 3.3.6 to 3.4.0 Signed-off-by: Joseph Witt <joew...@apache.org> --- nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 4 ++++ nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml | 9 +++++++++ .../nifi-record-utils/nifi-hadoop-record-utils/pom.xml | 9 +++++++++ nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml | 8 ++++++++ nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml | 9 +++++++++ .../nifi-hadoop-libraries-nar/pom.xml | 9 +++++++++ nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml | 8 ++++++++ nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml | 4 ++++ nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-common/pom.xml | 8 ++++++++ nifi-nar-bundles/nifi-iceberg-bundle/pom.xml | 5 +++++ .../nifi-parquet-bundle/nifi-parquet-processors/pom.xml | 9 +++++++++ .../nifi-hadoop-dbcp-service/pom.xml | 5 +++++ pom.xml | 2 +- 13 files changed, 88 insertions(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml index 7591140976..b94591de74 100644 --- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml @@ -97,6 +97,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <!-- Override hadoop-hdfs-client 3.3.0 from Atlas 2.2.0 --> 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 1d96a417ec..94e9746c44 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 @@ -77,8 +77,17 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> 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 97b1319ec2..2b02872246 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 @@ -56,8 +56,17 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> 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 b26b41cbba..b313679e91 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 @@ -140,6 +140,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -158,6 +162,10 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + </dependency> <dependency> <groupId>org.apache.flume.flume-ng-sinks</groupId> 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 ac4c059eb3..771b7f0fe7 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 @@ -68,8 +68,17 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-hdfs</artifactId> 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 9e38a71ee7..5575c8dd0f 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 @@ -44,8 +44,17 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml index e605dea205..9a727b3de3 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-test-utils/pom.xml @@ -57,6 +57,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -80,6 +84,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <!-- Override Guava 27 --> 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 917cd1ffb2..28f844ec73 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 @@ -248,6 +248,10 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-common/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-common/pom.xml index 7f47d371de..2ad4ec67fd 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-common/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/nifi-iceberg-common/pom.xml @@ -115,6 +115,10 @@ <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -122,5 +126,9 @@ <artifactId>commons-lang</artifactId> <version>2.6</version> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + </dependency> </dependencies> </project> \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml index 44c3e85dba..ed622a53ed 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml @@ -96,6 +96,11 @@ <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <!-- Override Guava 27 --> 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 6bcefa3087..f9509a0eb7 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 @@ -68,8 +68,17 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> 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 a19de03664..f2624a37f5 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 @@ -88,6 +88,11 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index eb94fc5090..13d45c0f47 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <nifi.groovy.version>3.0.19</nifi.groovy.version> <groovy.eclipse.batch.version>3.0.8-01</groovy.eclipse.batch.version> <surefire.version>3.2.5</surefire.version> - <hadoop.version>3.3.6</hadoop.version> + <hadoop.version>3.4.0</hadoop.version> <ozone.version>1.2.1</ozone.version> <gcs.version>2.1.5</gcs.version> <aspectj.version>1.9.6</aspectj.version>