From 7a0aa10afadbe5fc42019a46fbee0937be53c6f6 Mon Sep 17 00:00:00 2001 From: nvauto <70000568+nvauto@users.noreply.github.com> Date: Fri, 10 Jan 2025 09:19:28 +0000 Subject: [PATCH] Update version to 24.12.1-SNAPSHOT Wait for the pre-merge CI job to SUCCEED Signed-off-by: nvauto <70000568+nvauto@users.noreply.github.com> --- CONTRIBUTING.md | 8 ++++---- README.md | 2 +- aggregator/pom.xml | 6 +++--- api_validation/pom.xml | 6 +++--- datagen/README.md | 6 +++--- datagen/ScaleTest.md | 2 +- datagen/pom.xml | 6 +++--- delta-lake/delta-20x/pom.xml | 6 +++--- delta-lake/delta-21x/pom.xml | 6 +++--- delta-lake/delta-22x/pom.xml | 6 +++--- delta-lake/delta-23x/pom.xml | 6 +++--- delta-lake/delta-24x/pom.xml | 6 +++--- delta-lake/delta-spark330db/pom.xml | 6 +++--- delta-lake/delta-spark332db/pom.xml | 6 +++--- delta-lake/delta-spark341db/pom.xml | 6 +++--- delta-lake/delta-spark350db143/pom.xml | 6 +++--- delta-lake/delta-stub/pom.xml | 6 +++--- dist/pom.xml | 6 +++--- docs/archive.md | 18 +++++++++--------- docs/configs.md | 2 +- docs/dev/shims.md | 12 ++++++------ integration_tests/README.md | 6 +++--- integration_tests/ScaleTest.md | 2 +- integration_tests/pom.xml | 6 +++--- jdk-profiles/pom.xml | 6 +++--- jenkins/databricks/create.py | 4 ++-- jenkins/version-def.sh | 6 +++--- pom.xml | 4 ++-- scala2.13/aggregator/pom.xml | 6 +++--- scala2.13/api_validation/pom.xml | 6 +++--- scala2.13/datagen/pom.xml | 6 +++--- scala2.13/delta-lake/delta-20x/pom.xml | 6 +++--- scala2.13/delta-lake/delta-21x/pom.xml | 6 +++--- scala2.13/delta-lake/delta-22x/pom.xml | 6 +++--- scala2.13/delta-lake/delta-23x/pom.xml | 6 +++--- scala2.13/delta-lake/delta-24x/pom.xml | 6 +++--- scala2.13/delta-lake/delta-spark330db/pom.xml | 6 +++--- scala2.13/delta-lake/delta-spark332db/pom.xml | 6 +++--- scala2.13/delta-lake/delta-spark341db/pom.xml | 6 +++--- .../delta-lake/delta-spark350db143/pom.xml | 6 +++--- scala2.13/delta-lake/delta-stub/pom.xml | 6 +++--- scala2.13/dist/pom.xml | 6 +++--- scala2.13/integration_tests/pom.xml | 6 +++--- scala2.13/jdk-profiles/pom.xml | 6 +++--- scala2.13/pom.xml | 4 ++-- scala2.13/shim-deps/cloudera/pom.xml | 6 +++--- scala2.13/shim-deps/databricks/pom.xml | 6 +++--- scala2.13/shim-deps/pom.xml | 6 +++--- scala2.13/shuffle-plugin/pom.xml | 6 +++--- scala2.13/sql-plugin-api/pom.xml | 6 +++--- scala2.13/sql-plugin/pom.xml | 6 +++--- scala2.13/tests/pom.xml | 6 +++--- scala2.13/tools/pom.xml | 6 +++--- scala2.13/udf-compiler/pom.xml | 6 +++--- shim-deps/cloudera/pom.xml | 6 +++--- shim-deps/databricks/pom.xml | 6 +++--- shim-deps/pom.xml | 6 +++--- shuffle-plugin/pom.xml | 6 +++--- sql-plugin-api/pom.xml | 6 +++--- .../com/nvidia/spark/rapids/ShimLoader.scala | 10 +++++----- sql-plugin/pom.xml | 6 +++--- .../scala/com/nvidia/spark/rapids/Plugin.scala | 8 ++++---- .../com/nvidia/spark/rapids/RapidsConf.scala | 4 ++-- tests/pom.xml | 6 +++--- tools/pom.xml | 6 +++--- udf-compiler/pom.xml | 6 +++--- 66 files changed, 199 insertions(+), 199 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 83b30747abd..817faa885c7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -127,15 +127,15 @@ mvn -pl dist -PnoSnapshots package -DskipTests Verify that shim-specific classes are hidden from a conventional classloader. ```bash -$ javap -cp dist/target/rapids-4-spark_2.12-24.12.0-SNAPSHOT-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl +$ javap -cp dist/target/rapids-4-spark_2.12-24.12.1-SNAPSHOT-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl Error: class not found: com.nvidia.spark.rapids.shims.SparkShimImpl ``` However, its bytecode can be loaded if prefixed with `spark3XY` not contained in the package name ```bash -$ javap -cp dist/target/rapids-4-spark_2.12-24.12.0-SNAPSHOT-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2 -Warning: File dist/target/rapids-4-spark_2.12-24.12.0-SNAPSHOT-cuda11.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl +$ javap -cp dist/target/rapids-4-spark_2.12-24.12.1-SNAPSHOT-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2 +Warning: File dist/target/rapids-4-spark_2.12-24.12.1-SNAPSHOT-cuda11.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl Compiled from "SparkShims.scala" public final class com.nvidia.spark.rapids.shims.SparkShimImpl { ``` @@ -178,7 +178,7 @@ mvn package -pl dist -am -Dbuildver=340 -DallowConventionalDistJar=true Verify `com.nvidia.spark.rapids.shims.SparkShimImpl` is conventionally loadable: ```bash -$ javap -cp dist/target/rapids-4-spark_2.12-24.12.0-SNAPSHOT-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2 +$ javap -cp dist/target/rapids-4-spark_2.12-24.12.1-SNAPSHOT-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2 Compiled from "SparkShims.scala" public final class com.nvidia.spark.rapids.shims.SparkShimImpl { ``` diff --git a/README.md b/README.md index 94b73565190..34605a4d9f1 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ as a `provided` dependency. com.nvidia rapids-4-spark_2.12 - 24.12.0-SNAPSHOT + 24.12.1-SNAPSHOT provided ``` diff --git a/aggregator/pom.xml b/aggregator/pom.xml index c7a6c220247..3525bd5b1f8 100644 --- a/aggregator/pom.xml +++ b/aggregator/pom.xml @@ -1,6 +1,6 @@