This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new 074677e2226 HBASE-28939 Change the default Hadoop 3 version to 3.4.1
(#6400)
074677e2226 is described below
commit 074677e22260c62cab68592a4d7db8827c5c2297
Author: Istvan Toth <[email protected]>
AuthorDate: Sun Oct 27 15:47:17 2024 +0100
HBASE-28939 Change the default Hadoop 3 version to 3.4.1 (#6400)
Signed-off-by: Duo Zhang <[email protected]>
(cherry picked from commit 5f7952a019e46dda7400c3816b2ebe8c84728cbe)
---
dev-support/Jenkinsfile | 4 ++--
hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 3 ++-
.../src/test/resources/ensure-jars-have-correct-contents.sh | 2 ++
.../src/test/resources/ensure-jars-have-correct-contents.sh | 2 ++
pom.xml | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index e208017c9a8..49096c4751e 100644
--- a/dev-support/Jenkinsfile
+++ b/dev-support/Jenkinsfile
@@ -59,8 +59,8 @@ pipeline {
ASF_NIGHTLIES_BASE_ORI =
"${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}"
ASF_NIGHTLIES_BASE = "${ASF_NIGHTLIES_BASE_ORI.replaceAll(' ', '%20')}"
// These are dependent on the branch
- HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0"
- HADOOP3_DEFAULT_VERSION = "3.3.5"
+ HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1"
+ HADOOP3_DEFAULT_VERSION = "3.4.1"
}
parameters {
booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false,
description: '''Check to use the current HEAD of apache/yetus rather than our
configured release.
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index afa1a9f50cf..2069632708c 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1478,7 +1478,8 @@ ${dep.scm.url}
#if( ${dep.licenses[0].name.contains("CDDL")} )
#if( ${dep.licenses[0].name.contains("1.0")} )
#set($aggregated = $cddl_1_0.add($dep))
-#elseif( ${dep.licenses[0].name.contains("1.1")} )
+#elseif( ${dep.licenses[0].name.contains("1.1")}
+ || ${dep.licenses[0].name.contains("CDDL+GPL")} )
#set($aggregated = $cddl_1_1.add($dep))
#end
#end
diff --git
a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
index f9fc294cc99..0ca7ecc5817 100644
---
a/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+++
b/hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
@@ -108,6 +108,8 @@ if [ -n "${allow_hadoop}" ]; then
allowed_expr+="|^[^-]*-version-info.properties$"
# * Hadoop's application classloader properties file.
allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
+ # * Comes from dnssecjava via Hadoop
+ allowed_expr+="|^messages.properties$"
else
# We have some classes for integrating with the Hadoop Metrics2 system
# that have to be in a particular package space due to access rules.
diff --git
a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
index f9fc294cc99..0ca7ecc5817 100644
---
a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
+++
b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
@@ -108,6 +108,8 @@ if [ -n "${allow_hadoop}" ]; then
allowed_expr+="|^[^-]*-version-info.properties$"
# * Hadoop's application classloader properties file.
allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
+ # * Comes from dnssecjava via Hadoop
+ allowed_expr+="|^messages.properties$"
else
# We have some classes for integrating with the Hadoop Metrics2 system
# that have to be in a particular package space due to access rules.
diff --git a/pom.xml b/pom.xml
index ccc45f5a4ec..e90aa20f149 100644
--- a/pom.xml
+++ b/pom.xml
@@ -799,7 +799,7 @@
<maven.min.version>3.5.0</maven.min.version>
<java.min.version>${compileSource}</java.min.version>
<!-- Dependencies -->
- <hadoop-three.version>3.3.5</hadoop-three.version>
+ <hadoop-three.version>3.4.1</hadoop-three.version>
<!-- These must be defined here for downstream build tools that don't look
at profiles.
-->
<hadoop.version>${hadoop-three.version}</hadoop.version>
