From 408c18fef922f74e05f7b646d1188cd5ac9c39a5 Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Fri, 25 Oct 2024 14:58:54 +0200 Subject: [PATCH 1/5] HBASE-28939 Change the default Hadoop 3 version to 3.4.1 --- dev-support/Jenkinsfile | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 4357bb0d0cc6..f44961a61f21 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -60,7 +60,7 @@ pipeline { 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_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/pom.xml b/pom.xml index d121edadcb38..9ce6d0294037 100644 --- a/pom.xml +++ b/pom.xml @@ -823,7 +823,7 @@ 3.5.0 ${compileSource} - 3.3.5 + 3.4.1 ${hadoop-three.version} From ef13ef36752453f224eb7f29a62ea42b7663e79e Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Fri, 25 Oct 2024 17:08:12 +0200 Subject: [PATCH 2/5] recognize CDDL+GPL license --- hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 afa1a9f50cf9..2069632708cd 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 From 0ae0d5e1357fe7871d115f16a05e1ad9315ae14c Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Fri, 25 Oct 2024 17:43:17 +0200 Subject: [PATCH 3/5] allow messages.properties from dnsjava in shaded jars with Hadoop --- .../src/test/resources/ensure-jars-have-correct-contents.sh | 2 ++ 1 file changed, 2 insertions(+) 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 f9fc294cc992..0ca7ecc58175 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. From 1476e8c143a1985ee109539a0f9be40423fa9b24 Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Fri, 25 Oct 2024 17:52:59 +0200 Subject: [PATCH 4/5] sync enforcer files --- .../src/test/resources/ensure-jars-have-correct-contents.sh | 2 ++ 1 file changed, 2 insertions(+) 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 f9fc294cc992..0ca7ecc58175 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. From 5dfdcd1b7cc2eb8245652f7b964cc059539acd6f Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Fri, 25 Oct 2024 18:05:48 +0200 Subject: [PATCH 5/5] fix HADOOP3_VERSIONS in nightly Jenkinsfile --- dev-support/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index f44961a61f21..8f89ee5ba517 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -59,7 +59,7 @@ 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_VERSIONS = "3.3.5,3.3.6,3.4.0,3.4.1" HADOOP3_DEFAULT_VERSION = "3.4.1" } parameters {