Skip to content

Commit 5f7952a

Browse files
authored
HBASE-28939 Change the default Hadoop 3 version to 3.4.1 (#6400)
Signed-off-by: Duo Zhang <[email protected]>
1 parent 1e0884d commit 5f7952a

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

dev-support/Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ pipeline {
5959
ASF_NIGHTLIES_BASE_ORI = "${ASF_NIGHTLIES}/hbase/${JOB_NAME}/${BUILD_NUMBER}"
6060
ASF_NIGHTLIES_BASE = "${ASF_NIGHTLIES_BASE_ORI.replaceAll(' ', '%20')}"
6161
// These are dependent on the branch
62-
HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0"
63-
HADOOP3_DEFAULT_VERSION = "3.3.5"
62+
HADOOP3_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1"
63+
HADOOP3_DEFAULT_VERSION = "3.4.1"
6464
}
6565
parameters {
6666
booleanParam(name: 'USE_YETUS_PRERELEASE', defaultValue: false, description: '''Check to use the current HEAD of apache/yetus rather than our configured release.

hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,8 @@ ${dep.scm.url}
14781478
#if( ${dep.licenses[0].name.contains("CDDL")} )
14791479
#if( ${dep.licenses[0].name.contains("1.0")} )
14801480
#set($aggregated = $cddl_1_0.add($dep))
1481-
#elseif( ${dep.licenses[0].name.contains("1.1")} )
1481+
#elseif( ${dep.licenses[0].name.contains("1.1")}
1482+
|| ${dep.licenses[0].name.contains("CDDL+GPL")} )
14821483
#set($aggregated = $cddl_1_1.add($dep))
14831484
#end
14841485
#end

hbase-shaded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ if [ -n "${allow_hadoop}" ]; then
108108
allowed_expr+="|^[^-]*-version-info.properties$"
109109
# * Hadoop's application classloader properties file.
110110
allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
111+
# * Comes from dnssecjava via Hadoop
112+
allowed_expr+="|^messages.properties$"
111113
else
112114
# We have some classes for integrating with the Hadoop Metrics2 system
113115
# that have to be in a particular package space due to access rules.

hbase-shaded/hbase-shaded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ if [ -n "${allow_hadoop}" ]; then
108108
allowed_expr+="|^[^-]*-version-info.properties$"
109109
# * Hadoop's application classloader properties file.
110110
allowed_expr+="|^org.apache.hadoop.application-classloader.properties$"
111+
# * Comes from dnssecjava via Hadoop
112+
allowed_expr+="|^messages.properties$"
111113
else
112114
# We have some classes for integrating with the Hadoop Metrics2 system
113115
# that have to be in a particular package space due to access rules.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@
823823
<maven.min.version>3.5.0</maven.min.version>
824824
<java.min.version>${compileSource}</java.min.version>
825825
<!-- Dependencies -->
826-
<hadoop-three.version>3.3.5</hadoop-three.version>
826+
<hadoop-three.version>3.4.1</hadoop-three.version>
827827
<!-- These must be defined here for downstream build tools that don't look at profiles.
828828
-->
829829
<hadoop.version>${hadoop-three.version}</hadoop.version>

0 commit comments

Comments
 (0)