Skip to content

Commit

Permalink
Consolidate deps switching in an intermediate pom [databricks] (NVIDI…
Browse files Browse the repository at this point in the history 
…A#9508)

Factor out dependency switching profiles for different Spark builds into a single intermediate parent pom

Fixes NVIDIA#9552 

Signed-off-by: Gera Shegalov <[email protected]>
  • Loading branch information
@gerashegalov
gerashegalov authored Oct 31, 2023
1 parent 3b87797 commit 51f933f
Show file tree
Hide file tree
Showing 26 changed files with 372 additions and 1,178 deletions.
1 change: 0 additions & 1 deletion aggregator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-parent_2.12</artifactId>
<version>23.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rapids-4-spark-aggregator_2.12</artifactId>
<name>RAPIDS Accelerator for Apache Spark Aggregator</name>
Expand Down
65 changes: 2 additions & 63 deletions api_validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,77 +21,16 @@

<parent>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-parent_2.12</artifactId>
<artifactId>rapids-4-spark-shim-deps-parent_2.12</artifactId>
<version>23.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../shim-deps/pom.xml</relativePath>
</parent>
<artifactId>rapids-4-spark-api-validation_2.12</artifactId>
<version>23.12.0-SNAPSHOT</version>

<properties>
<rapids.module>api_validation</rapids.module>
</properties>

<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>release311</id>
<properties>
<spark.version>${spark311.version}</spark.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>release320</id>
<properties>
<spark.version>${spark320.version}</spark.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>release321cdh</id>
<activation>
<property>
<name>buildver</name>
<value>321cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
Expand Down
62 changes: 2 additions & 60 deletions datagen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-parent_2.12</artifactId>
<artifactId>rapids-4-spark-shim-deps-parent_2.12</artifactId>
<version>23.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../shim-deps/pom.xml</relativePath>
</parent>
<artifactId>datagen_2.12</artifactId>
<name>Data Generator</name>
Expand Down Expand Up @@ -61,63 +60,6 @@
<version>3.7.1</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>release321cdh</id>
<activation>
<property>
<name>buildver</name>
<value>321cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>release330cdh</id>
<activation>
<property>
<name>buildver</name>
<value>330cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>dbdeps</id>
<activation>
<property>
<name>databricks</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-db-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<!-- disable surefire as we are using scalatest only -->
Expand Down
1 change: 0 additions & 1 deletion dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-parent_2.12</artifactId>
<version>23.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rapids-4-spark_2.12</artifactId>
<name>RAPIDS Accelerator for Apache Spark Distribution</name>
Expand Down
78 changes: 2 additions & 76 deletions integration_tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@

<parent>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-parent_2.12</artifactId>
<artifactId>rapids-4-spark-shim-deps-parent_2.12</artifactId>
<version>23.12.0-SNAPSHOT</version>
<relativePath>../shim-deps/pom.xml</relativePath>
</parent>
<artifactId>rapids-4-spark-integration-tests_2.12</artifactId>
<version>23.12.0-SNAPSHOT</version>
Expand Down Expand Up @@ -75,81 +76,6 @@
<version>4.1.0</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>release321cdh</id>
<activation>
<property>
<name>buildver</name>
<value>321cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>release330cdh</id>
<activation>
<property>
<name>buildver</name>
<value>330cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>release332cdh</id>
<activation>
<property>
<name>buildver</name>
<value>332cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>dbdeps</id>
<activation>
<property>
<name>databricks</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-db-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down
7 changes: 7 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@
<module>datagen</module>
<module>dist</module>
<module>integration_tests</module>

<!--
not a real module, workaround to enforce the build order
ROOT -> shim
-->
<module>shim-deps</module>

<module>shuffle-plugin</module>
<module>sql-plugin</module>
<module>sql-plugin-api</module>
Expand Down
1 change: 0 additions & 1 deletion scala2.13/aggregator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-parent_2.13</artifactId>
<version>23.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>rapids-4-spark-aggregator_2.13</artifactId>
<name>RAPIDS Accelerator for Apache Spark Aggregator</name>
Expand Down
65 changes: 2 additions & 63 deletions scala2.13/api_validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,77 +21,16 @@

<parent>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-parent_2.13</artifactId>
<artifactId>rapids-4-spark-shim-deps-parent_2.13</artifactId>
<version>23.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../shim-deps/pom.xml</relativePath>
</parent>
<artifactId>rapids-4-spark-api-validation_2.13</artifactId>
<version>23.12.0-SNAPSHOT</version>

<properties>
<rapids.module>api_validation</rapids.module>
</properties>

<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>release311</id>
<properties>
<spark.version>${spark311.version}</spark.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>release320</id>
<properties>
<spark.version>${spark320.version}</spark.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>release321cdh</id>
<activation>
<property>
<name>buildver</name>
<value>321cdh</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-cdh-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
Expand Down
Loading

0 comments on commit 51f933f

Please sign in to comment.