From 51f933fc029821e92392b6c680149d6a6e8e99f3 Mon Sep 17 00:00:00 2001 From: Gera Shegalov Date: Tue, 31 Oct 2023 08:57:54 -0700 Subject: [PATCH] Consolidate deps switching in an intermediate pom [databricks] (#9508) Factor out dependency switching profiles for different Spark builds into a single intermediate parent pom Fixes #9552 Signed-off-by: Gera Shegalov --- aggregator/pom.xml | 1 - api_validation/pom.xml | 65 +---------- datagen/pom.xml | 62 +--------- dist/pom.xml | 1 - integration_tests/pom.xml | 78 +------------ pom.xml | 7 ++ scala2.13/aggregator/pom.xml | 1 - scala2.13/api_validation/pom.xml | 65 +---------- scala2.13/datagen/pom.xml | 62 +--------- scala2.13/dist/pom.xml | 1 - scala2.13/integration_tests/pom.xml | 78 +------------ scala2.13/pom.xml | 7 ++ scala2.13/shim-deps/databricks/pom.xml | 5 + scala2.13/shim-deps/pom.xml | 155 +++++++++++++++++++++++++ scala2.13/shuffle-plugin/pom.xml | 63 +--------- scala2.13/sql-plugin-api/pom.xml | 39 +------ scala2.13/sql-plugin/pom.xml | 131 +-------------------- scala2.13/tests/pom.xml | 82 +------------ scala2.13/udf-compiler/pom.xml | 86 +------------- shim-deps/databricks/pom.xml | 5 + shim-deps/pom.xml | 155 +++++++++++++++++++++++++ shuffle-plugin/pom.xml | 63 +--------- sql-plugin-api/pom.xml | 39 +------ sql-plugin/pom.xml | 131 +-------------------- tests/pom.xml | 82 +------------ udf-compiler/pom.xml | 86 +------------- 26 files changed, 372 insertions(+), 1178 deletions(-) create mode 100644 scala2.13/shim-deps/pom.xml create mode 100644 shim-deps/pom.xml diff --git a/aggregator/pom.xml b/aggregator/pom.xml index 6c72912a164..9b8879fcffd 100644 --- a/aggregator/pom.xml +++ b/aggregator/pom.xml @@ -23,7 +23,6 @@ com.nvidia rapids-4-spark-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml rapids-4-spark-aggregator_2.12 RAPIDS Accelerator for Apache Spark Aggregator diff --git a/api_validation/pom.xml b/api_validation/pom.xml index de745381fd1..34c2404c3c0 100644 --- a/api_validation/pom.xml +++ b/api_validation/pom.xml @@ -21,9 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.12 + rapids-4-spark-shim-deps-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-api-validation_2.12 23.12.0-SNAPSHOT @@ -31,67 +31,6 @@ api_validation - - - - default - - true - - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - - - - - release311 - - ${spark311.version} - - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - - - - - release320 - - ${spark320.version} - - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - org.scala-lang diff --git a/datagen/pom.xml b/datagen/pom.xml index 400a76b6eb5..d22f874bb04 100644 --- a/datagen/pom.xml +++ b/datagen/pom.xml @@ -18,12 +18,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.nvidia - rapids-4-spark-parent_2.12 + rapids-4-spark-shim-deps-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml datagen_2.12 Data Generator @@ -61,63 +60,6 @@ 3.7.1 - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - diff --git a/dist/pom.xml b/dist/pom.xml index 34d76b5aa61..6cc5148636f 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -23,7 +23,6 @@ com.nvidia rapids-4-spark-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml rapids-4-spark_2.12 RAPIDS Accelerator for Apache Spark Distribution diff --git a/integration_tests/pom.xml b/integration_tests/pom.xml index bdc31987029..e5484e0fd49 100644 --- a/integration_tests/pom.xml +++ b/integration_tests/pom.xml @@ -21,8 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.12 + rapids-4-spark-shim-deps-parent_2.12 23.12.0-SNAPSHOT + ../shim-deps/pom.xml rapids-4-spark-integration-tests_2.12 23.12.0-SNAPSHOT @@ -75,81 +76,6 @@ 4.1.0 - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - diff --git a/pom.xml b/pom.xml index bc10e6d6180..f183cbdc77e 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,13 @@ datagen dist integration_tests + + + shim-deps + shuffle-plugin sql-plugin sql-plugin-api diff --git a/scala2.13/aggregator/pom.xml b/scala2.13/aggregator/pom.xml index a33ba487fa9..7017728c5c6 100644 --- a/scala2.13/aggregator/pom.xml +++ b/scala2.13/aggregator/pom.xml @@ -23,7 +23,6 @@ com.nvidia rapids-4-spark-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml rapids-4-spark-aggregator_2.13 RAPIDS Accelerator for Apache Spark Aggregator diff --git a/scala2.13/api_validation/pom.xml b/scala2.13/api_validation/pom.xml index c458f108f1a..02dbbf7017f 100644 --- a/scala2.13/api_validation/pom.xml +++ b/scala2.13/api_validation/pom.xml @@ -21,9 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.13 + rapids-4-spark-shim-deps-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-api-validation_2.13 23.12.0-SNAPSHOT @@ -31,67 +31,6 @@ api_validation - - - - default - - true - - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - - - - - release311 - - ${spark311.version} - - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - - - - - release320 - - ${spark320.version} - - - - org.apache.spark - spark-sql_${scala.binary.version} - ${spark.version} - - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - org.scala-lang diff --git a/scala2.13/datagen/pom.xml b/scala2.13/datagen/pom.xml index 62b7b50f2f0..5982ab5eeff 100644 --- a/scala2.13/datagen/pom.xml +++ b/scala2.13/datagen/pom.xml @@ -18,12 +18,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.nvidia - rapids-4-spark-parent_2.13 + rapids-4-spark-shim-deps-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml datagen_2.13 Data Generator @@ -61,63 +60,6 @@ 3.7.1 - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - diff --git a/scala2.13/dist/pom.xml b/scala2.13/dist/pom.xml index cbd88f4819e..be40227d564 100644 --- a/scala2.13/dist/pom.xml +++ b/scala2.13/dist/pom.xml @@ -23,7 +23,6 @@ com.nvidia rapids-4-spark-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml rapids-4-spark_2.13 RAPIDS Accelerator for Apache Spark Distribution diff --git a/scala2.13/integration_tests/pom.xml b/scala2.13/integration_tests/pom.xml index ced105eb9b1..a896a2773a3 100644 --- a/scala2.13/integration_tests/pom.xml +++ b/scala2.13/integration_tests/pom.xml @@ -21,8 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.13 + rapids-4-spark-shim-deps-parent_2.13 23.12.0-SNAPSHOT + ../shim-deps/pom.xml rapids-4-spark-integration-tests_2.13 23.12.0-SNAPSHOT @@ -75,81 +76,6 @@ 4.1.0 - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml index e36413dee2f..b0cafe5a0c1 100644 --- a/scala2.13/pom.xml +++ b/scala2.13/pom.xml @@ -75,6 +75,13 @@ datagen dist integration_tests + + + shim-deps + shuffle-plugin sql-plugin sql-plugin-api diff --git a/scala2.13/shim-deps/databricks/pom.xml b/scala2.13/shim-deps/databricks/pom.xml index 257cbf78b87..d9fc8a42b83 100644 --- a/scala2.13/shim-deps/databricks/pom.xml +++ b/scala2.13/shim-deps/databricks/pom.xml @@ -35,6 +35,11 @@ + + 4.0.0 + + + com.nvidia + rapids-4-spark-parent_2.13 + 23.12.0-SNAPSHOT + + rapids-4-spark-shim-deps-parent_2.13 + pom + Shim Dependencies Profiles + 23.12.0-SNAPSHOT + + + release321cdh + + + buildver + 321cdh + + + + + com.nvidia + rapids-4-spark-cdh-bom + ${project.version} + pom + provided + + + + + release330cdh + + + buildver + 330cdh + + + + + com.nvidia + rapids-4-spark-cdh-bom + ${project.version} + pom + provided + + + + + release332cdh + + + buildver + 332cdh + + + + + com.nvidia + rapids-4-spark-cdh-bom + ${project.version} + pom + provided + + + + + release330db + + + buildver + 330db + + + + + org.apache.logging.log4j + log4j-core + ${spark.version} + provided + + + + + release332db + + + buildver + 332db + + + + + org.apache.logging.log4j + log4j-core + ${spark.version} + provided + + + + + dbdeps + + + databricks + + + + + com.nvidia + rapids-4-spark-db-bom + ${project.version} + pom + provided + + + + + + with-classifier + + true + + + + org.apache.spark + spark-hive_${scala.binary.version} + + + org.apache.spark + spark-sql_${scala.binary.version} + + + + + \ No newline at end of file diff --git a/scala2.13/shuffle-plugin/pom.xml b/scala2.13/shuffle-plugin/pom.xml index 061335d162a..7432ac01a9c 100644 --- a/scala2.13/shuffle-plugin/pom.xml +++ b/scala2.13/shuffle-plugin/pom.xml @@ -18,14 +18,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.nvidia - rapids-4-spark-parent_2.13 - 23.12.0-SNAPSHOT - ../pom.xml - - + com.nvidia + rapids-4-spark-shim-deps-parent_2.13 + 23.12.0-SNAPSHOT + ../shim-deps/pom.xml + rapids-4-spark-shuffle_2.13 RAPIDS Accelerator for Apache Spark Shuffle Plugin Accelerated shuffle plugin for the RAPIDS plugin for Apache Spark @@ -60,57 +58,6 @@ provided - - - - with-classifier - - true - - - - org.apache.spark - spark-sql_${scala.binary.version} - - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - diff --git a/scala2.13/sql-plugin-api/pom.xml b/scala2.13/sql-plugin-api/pom.xml index 3dd6bec6030..d885f745cdb 100644 --- a/scala2.13/sql-plugin-api/pom.xml +++ b/scala2.13/sql-plugin-api/pom.xml @@ -21,9 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.13 + rapids-4-spark-shim-deps-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-sql-plugin-api_2.13 @@ -42,41 +42,6 @@ ${jni.classifier} - - - with-classifier - - true - - - - org.apache.spark - spark-hive_${scala.binary.version} - - - org.apache.spark - spark-sql_${scala.binary.version} - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - diff --git a/scala2.13/sql-plugin/pom.xml b/scala2.13/sql-plugin/pom.xml index 628655f33f5..02090fb5e7e 100644 --- a/scala2.13/sql-plugin/pom.xml +++ b/scala2.13/sql-plugin/pom.xml @@ -21,9 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.13 + rapids-4-spark-shim-deps-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-sql_2.13 RAPIDS Accelerator for Apache Spark SQL Plugin @@ -103,133 +103,6 @@ test - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330db - - - buildver - 330db - - - - - org.apache.logging.log4j - log4j-core - ${spark.version} - provided - - - - - release332db - - - buildver - 332db - - - - - org.apache.logging.log4j - log4j-core - ${spark.version} - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - - with-classifier - - true - - - - org.apache.spark - spark-hive_${scala.binary.version} - - - org.apache.spark - spark-sql_${scala.binary.version} - - - - - - diff --git a/scala2.13/tests/pom.xml b/scala2.13/tests/pom.xml index 725d93b51df..fc9515b1068 100644 --- a/scala2.13/tests/pom.xml +++ b/scala2.13/tests/pom.xml @@ -18,12 +18,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.nvidia - rapids-4-spark-parent_2.13 + rapids-4-spark-shim-deps-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-tests_2.13 RAPIDS Accelerator for Apache Spark Tests @@ -107,83 +106,6 @@ - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - release321 diff --git a/scala2.13/udf-compiler/pom.xml b/scala2.13/udf-compiler/pom.xml index 23bc8c092f3..4920c358d42 100644 --- a/scala2.13/udf-compiler/pom.xml +++ b/scala2.13/udf-compiler/pom.xml @@ -18,12 +18,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.nvidia - rapids-4-spark-parent_2.13 + rapids-4-spark-shim-deps-parent_2.13 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-udf_2.13 RAPIDS Accelerator for Apache Spark Scala UDF Plugin @@ -64,87 +63,6 @@ provided - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - diff --git a/shim-deps/databricks/pom.xml b/shim-deps/databricks/pom.xml index 4cf7d3ae62b..efcabc3e72b 100644 --- a/shim-deps/databricks/pom.xml +++ b/shim-deps/databricks/pom.xml @@ -35,6 +35,11 @@ + + 4.0.0 + + + com.nvidia + rapids-4-spark-parent_2.12 + 23.12.0-SNAPSHOT + + rapids-4-spark-shim-deps-parent_2.12 + pom + Shim Dependencies Profiles + 23.12.0-SNAPSHOT + + + release321cdh + + + buildver + 321cdh + + + + + com.nvidia + rapids-4-spark-cdh-bom + ${project.version} + pom + provided + + + + + release330cdh + + + buildver + 330cdh + + + + + com.nvidia + rapids-4-spark-cdh-bom + ${project.version} + pom + provided + + + + + release332cdh + + + buildver + 332cdh + + + + + com.nvidia + rapids-4-spark-cdh-bom + ${project.version} + pom + provided + + + + + release330db + + + buildver + 330db + + + + + org.apache.logging.log4j + log4j-core + ${spark.version} + provided + + + + + release332db + + + buildver + 332db + + + + + org.apache.logging.log4j + log4j-core + ${spark.version} + provided + + + + + dbdeps + + + databricks + + + + + com.nvidia + rapids-4-spark-db-bom + ${project.version} + pom + provided + + + + + + with-classifier + + true + + + + org.apache.spark + spark-hive_${scala.binary.version} + + + org.apache.spark + spark-sql_${scala.binary.version} + + + + + \ No newline at end of file diff --git a/shuffle-plugin/pom.xml b/shuffle-plugin/pom.xml index 0ac4d56793f..fe7894874da 100644 --- a/shuffle-plugin/pom.xml +++ b/shuffle-plugin/pom.xml @@ -18,14 +18,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.nvidia - rapids-4-spark-parent_2.12 - 23.12.0-SNAPSHOT - ../pom.xml - - + com.nvidia + rapids-4-spark-shim-deps-parent_2.12 + 23.12.0-SNAPSHOT + ../shim-deps/pom.xml + rapids-4-spark-shuffle_2.12 RAPIDS Accelerator for Apache Spark Shuffle Plugin Accelerated shuffle plugin for the RAPIDS plugin for Apache Spark @@ -60,57 +58,6 @@ provided - - - - with-classifier - - true - - - - org.apache.spark - spark-sql_${scala.binary.version} - - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - diff --git a/sql-plugin-api/pom.xml b/sql-plugin-api/pom.xml index c1724b8a585..1ccc411ca30 100644 --- a/sql-plugin-api/pom.xml +++ b/sql-plugin-api/pom.xml @@ -21,9 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.12 + rapids-4-spark-shim-deps-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-sql-plugin-api_2.12 @@ -42,41 +42,6 @@ ${jni.classifier} - - - with-classifier - - true - - - - org.apache.spark - spark-hive_${scala.binary.version} - - - org.apache.spark - spark-sql_${scala.binary.version} - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - diff --git a/sql-plugin/pom.xml b/sql-plugin/pom.xml index e59f1805c44..9d752b57f8d 100644 --- a/sql-plugin/pom.xml +++ b/sql-plugin/pom.xml @@ -21,9 +21,9 @@ com.nvidia - rapids-4-spark-parent_2.12 + rapids-4-spark-shim-deps-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-sql_2.12 RAPIDS Accelerator for Apache Spark SQL Plugin @@ -103,133 +103,6 @@ test - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330db - - - buildver - 330db - - - - - org.apache.logging.log4j - log4j-core - ${spark.version} - provided - - - - - release332db - - - buildver - 332db - - - - - org.apache.logging.log4j - log4j-core - ${spark.version} - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - - with-classifier - - true - - - - org.apache.spark - spark-hive_${scala.binary.version} - - - org.apache.spark - spark-sql_${scala.binary.version} - - - - - - diff --git a/tests/pom.xml b/tests/pom.xml index 235f83494b7..1dc1807c887 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -18,12 +18,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.nvidia - rapids-4-spark-parent_2.12 + rapids-4-spark-shim-deps-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-tests_2.12 RAPIDS Accelerator for Apache Spark Tests @@ -107,83 +106,6 @@ - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - release321 diff --git a/udf-compiler/pom.xml b/udf-compiler/pom.xml index 9b0a16d6fef..adf26a680ca 100644 --- a/udf-compiler/pom.xml +++ b/udf-compiler/pom.xml @@ -18,12 +18,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.nvidia - rapids-4-spark-parent_2.12 + rapids-4-spark-shim-deps-parent_2.12 23.12.0-SNAPSHOT - ../pom.xml + ../shim-deps/pom.xml rapids-4-spark-udf_2.12 RAPIDS Accelerator for Apache Spark Scala UDF Plugin @@ -64,87 +63,6 @@ provided - - - - dbdeps - - - databricks - - - - - com.nvidia - rapids-4-spark-db-bom - ${project.version} - pom - provided - - - - - release321cdh - - - buildver - 321cdh - - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release330cdh - - - buildver - 330cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - - release332cdh - - - buildver - 332cdh - - - - ${buildver} - - - - com.nvidia - rapids-4-spark-cdh-bom - ${project.version} - pom - provided - - - - -