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
The following commit(s) were added to refs/heads/main by this push: new dd9d1c978f NIFI-12943 Upgraded Hadoop from 3.3.6 to 3.4.0 This closes #8556 dd9d1c978f is described below commit dd9d1c978f7d4854ac0d53140f72f7c96c4e1d71 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 This closes #8556 Signed-off-by: Joseph Witt <joew...@apache.org> --- 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-hadoop-bundle/nifi-hdfs-processors/pom.xml | 9 +++++++++ .../nifi-hadoop-libraries-nar/pom.xml | 9 +++++++++ nifi-nar-bundles/nifi-hive-bundle/pom.xml | 5 +++++ 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 +- 9 files changed, 61 insertions(+), 1 deletion(-) 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 cf1d9242a3..d1e4968f83 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 @@ -76,8 +76,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 978495d3b3..e01ed8aa80 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 @@ -64,8 +64,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-hadoop-bundle/nifi-hdfs-processors/pom.xml b/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/pom.xml index 357f057dbc..420086edde 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 @@ -67,8 +67,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 2d2a8c1f49..a0d2c466a4 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 @@ -73,8 +73,17 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-rewrite</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/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml index 48c41e0089..1c7544f072 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml @@ -245,6 +245,11 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-rewrite</artifactId> </exclusion> + <!-- Excluded for Hadoop 3.4.0 --> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> </exclusions> </dependency> </dependencies> diff --git a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml index f6c96fb45b..fdcbc880f0 100644 --- a/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iceberg-bundle/pom.xml @@ -147,6 +147,11 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-rewrite</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 fe09b2e5fd..e8cb2ced46 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 @@ -77,8 +77,17 @@ <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>websocket-client</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 4f23161056..37a0370672 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 @@ -87,6 +87,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 9004ee27d3..fa5b6f86dc 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <json.smart.version>2.5.0</json.smart.version> <groovy.version>4.0.20</groovy.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.21</aspectj.version>