Skip to content

HBASE-28939 Change the default Hadoop 3 version to 3.4.1 #6400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 27, 2024
Merged

HBASE-28939 Change the default Hadoop 3 version to 3.4.1 #6400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
408c18f
HBASE-28939 Change the default Hadoop 3 version to 3.4.1
stoty Oct 25, 2024
ef13ef3
recognize CDDL+GPL license
stoty Oct 25, 2024
0ae0d5e
allow messages.properties from dnsjava in shaded jars with Hadoop
stoty Oct 25, 2024
1476e8c
sync enforcer files
stoty Oct 25, 2024
5dfdcd1
fix HADOOP3_VERSIONS in nightly Jenkinsfile
stoty Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev-support/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions ...ded/hbase-shaded-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions ...aded-with-hadoop-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,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>
Expand Down