This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 1506ed64e00 HBASE-28980 Change the default Hadoop 3 version to 3.4.1
on branch-2.5 and branch-2.6 (#6478)
1506ed64e00 is described below
commit 1506ed64e00c68f1744a3ab8c84f6c1b18462aa1
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Jan 9 11:55:22 2025 +0100
HBASE-28980 Change the default Hadoop 3 version to 3.4.1 on branch-2.5 and
branch-2.6 (#6478)
---
dev-support/Jenkinsfile | 4 ++--
.../src/main/resources/META-INF/LICENSE.vm | 3 ++-
.../src/main/resources/supplemental-models.xml | 18 ++++++++++++++++++
.../resources/ensure-jars-have-correct-contents.sh | 2 ++
.../resources/ensure-jars-have-correct-contents.sh | 2 ++
pom.xml | 2 +-
6 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile
index b8b2068a5cf..833c425b4ef 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-resource-bundle/src/main/resources/supplemental-models.xml
b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
index 624b0ea8e38..e1378583a87 100644
--- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml
+++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml
@@ -804,6 +804,24 @@ under the License.
</licenses>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk18on</artifactId>
+
+ <licenses>
+ <!-- bcutil-jdk18on is licensed under the Bouncy Castle License, which
is equivalent to the MIT License -->
+ <license>
+ <name>MIT License</name>
+ <url>http://www.opensource.org/licenses/mit-license.php</url>
+ <distribution>repo</distribution>
+ <comments>
+ Copyright (c) 2000 - 2018 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
+ </comments>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
<supplement>
<project>
<groupId>org.eclipse.jetty</groupId>
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 d377eca950e..c6a923fb902 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
@@ -110,6 +110,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 d377eca950e..c6a923fb902 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
@@ -110,6 +110,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 79d06a88992..fb49db6e4f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -548,7 +548,7 @@
<java.min.version>${compileSource}</java.min.version>
<!-- Dependencies -->
<hadoop-two.version>2.10.2</hadoop-two.version>
- <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.
They ought to match the values found in our default hadoop profile,
which is
currently "hadoop-2.0". See HBASE-15925 for more info. -->
