Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consolidate deps switching in an intermediate pom [databricks] #9508

Merged
merged 12 commits into from
Oct 31, 2023
Merged

Consolidate deps switching in an intermediate pom [databricks] #9508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
093e31d
Consolidate deps switching in an intermediate pom
gerashegalov Oct 22, 2023
824cc80
Merge remote-tracking branch 'origin/branch-23.12' into shimDepsSwitc…
gerashegalov Oct 24, 2023
e0b5384
Merge remote-tracking branch 'origin/branch-23.12' into shimDepsSwitc…
gerashegalov Oct 26, 2023
225e517
Revert inclusion of shim-deps module
gerashegalov Oct 26, 2023
956d952
Merge remote-tracking branch 'origin/branch-23.12' into shimDepsSwitc…
gerashegalov Oct 26, 2023
1410c12
Merge remote-tracking branch 'origin/branch-23.12' into shimDepsSwitc…
gerashegalov Oct 27, 2023
addaccb
merge
gerashegalov Oct 27, 2023
53258d8
Merge remote-tracking branch 'origin/branch-23.12' into shimDepsSwitc…
gerashegalov Oct 27, 2023
b881e30
shim-deps module as a build order function for a decendant
gerashegalov Oct 27, 2023
7ae26ba
regenerate 2.13 poms
gerashegalov Oct 27, 2023
30646ec
make shim-deps 2.12/2.13 sensitive
gerashegalov Oct 27, 2023
50254a2
Merge remote-tracking branch 'origin/branch-23.12' into shimDepsSwitc…
gerashegalov Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion aggregator/pom.xml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
11 changes: 9 additions & 2 deletions pom.xml
View file
Open in desktop
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 Expand Up @@ -1346,13 +1353,13 @@
<skip>${maven.cleanall.skip}</skip>
<target>
<!-- #if scala-2.12 -->
<dirset dir="${project.basedir}"
<dirset dir="${project.basedir}"
includes="**/target"
excludes="scala2.13/**"
id="target.dirs.for.clean"/>
<!-- #endif scala-2.12 -->
<!-- #if scala-2.13 --><!--
<dirset dir="${project.basedir}"
<dirset dir="${project.basedir}"
includes="**/target"
id="target.dirs.for.clean"/>
--><!-- #endif scala-2.13 -->
Expand Down
1 change: 0 additions & 1 deletion scala2.13/aggregator/pom.xml
View file
Open in desktop
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
Open in desktop
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