This is an automated email from the ASF dual-hosted git repository. danny0405 pushed a commit to branch release-1.1.2 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 5d8978d351158ef064446fa678ca581abb41ee32 Author: danny0405 <[email protected]> AuthorDate: Sat Oct 17 10:42:25 2026 +0800 fix(build): resolve release staging and Spark 4 Docker startup issues --- .../bundle-validation/docker_java17/docker_java17_test.sh | 8 +++++++- pom.xml | 13 ++++++++++++- scripts/release/deploy_staging_jars.sh | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packaging/bundle-validation/docker_java17/docker_java17_test.sh b/packaging/bundle-validation/docker_java17/docker_java17_test.sh index 4de72e5e2176..84369e3d2a5b 100755 --- a/packaging/bundle-validation/docker_java17/docker_java17_test.sh +++ b/packaging/bundle-validation/docker_java17/docker_java17_test.sh @@ -50,6 +50,11 @@ start_datanode () { local dn=$1 local data_dir="$DOCKER_TEST_DIR/additional_datanode/$dn" local pid_dir="$DOCKER_TEST_DIR/pid/datanode-$dn" + local datanode_options=() + if [ "$SPARK_PROFILE" = "spark4.0" ]; then + # Avoid the native shared-memory crash in the Spark 4 image's Hadoop 3.4.0. + datanode_options+=(-Ddfs.short.circuit.shared.memory.watcher.interrupt.check.ms=0) + fi echo "::warning::docker_test_java17.sh starting datanode:$dn" mkdir -p "$data_dir" "$pid_dir" || return 1 @@ -57,7 +62,8 @@ start_datanode () { -Dhadoop.tmp.dir="$data_dir" \ -Ddfs.datanode.address="localhost:5001$dn" \ -Ddfs.datanode.http.address="localhost:5008$dn" \ - -Ddfs.datanode.ipc.address="localhost:5002$dn" + -Ddfs.datanode.ipc.address="localhost:5002$dn" \ + "${datanode_options[@]}" } setup_hdfs () { diff --git a/pom.xml b/pom.xml index 06bd1518d9af..9682c032dcbb 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version> <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version> <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version> - <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version> + <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version> <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version> <maven-deploy-plugin.version>2.4</maven-deploy-plugin.version> <genjavadoc-plugin.version>0.18_2.13.10</genjavadoc-plugin.version> @@ -1885,7 +1885,18 @@ </execution> </executions> <configuration> + <source>${java.version}</source> <doclint>none</doclint> + <!-- Include the module's compiled Scala classes when documenting Java sources. --> + <additionalDependencies> + <additionalDependency> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <scope>system</scope> + <systemPath>${project.build.directory}/${project.build.finalName}.jar</systemPath> + </additionalDependency> + </additionalDependencies> </configuration> </plugin> <plugin> diff --git a/scripts/release/deploy_staging_jars.sh b/scripts/release/deploy_staging_jars.sh index 5906ce65f60f..852f2263d2fc 100755 --- a/scripts/release/deploy_staging_jars.sh +++ b/scripts/release/deploy_staging_jars.sh @@ -95,7 +95,8 @@ elif [ "$#" == "1" ]; then exit 1 fi -COMMON_OPTIONS="-DdeployArtifacts=true -DskipTests -DretryFailedDeploymentCount=10" +# Spark profiles can override skipITs, so explicitly skip integration tests during deployment. +COMMON_OPTIONS="-DdeployArtifacts=true -DskipTests -DskipITs=true -DretryFailedDeploymentCount=10" for v in "${ALL_VERSION_OPTS[@]}" do # TODO: consider cleaning all modules by listing directories instead of specifying profile
