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.

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

Update to include Spark 3.2.0 in nosnapshots target so it gets released officially. #3810

Merged
merged 3 commits into from
Oct 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ com.nvidia.spark.rapids.shims.spark303.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark311.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark312.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark311cdh.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark320.SparkShimServiceProvider
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ com.nvidia.spark.rapids.shims.spark303.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark311.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark312.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark311cdh.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark320.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark301db.SparkShimServiceProvider
com.nvidia.spark.rapids.shims.spark311db.SparkShimServiceProvider
42 changes: 42 additions & 0 deletions dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,15 @@
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/deps</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-aggregator_2.12</artifactId>
<classifier>spark320</classifier>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/deps</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-aggregator_2.12</artifactId>
Expand Down Expand Up @@ -284,6 +293,18 @@
>
<patternset refid="excludeMeta"/>
</unzip>
<unzip
src="${project.build.directory}/deps/rapids-4-spark-aggregator_${scala.binary.version}-${project.version}-spark320.jar"
dest="${project.build.directory}/parallel-world/"
>
<patternset refid="includeMeta"/>
</unzip>
<unzip
src="${project.build.directory}/deps/rapids-4-spark-aggregator_${scala.binary.version}-${project.version}-spark320.jar"
dest="${project.build.directory}/parallel-world/spark320"
>
<patternset refid="excludeMeta"/>
</unzip>
<unzip
src="${project.build.directory}/deps/rapids-4-spark-aggregator_${scala.binary.version}-${project.version}-spark301db.jar"
dest="${project.build.directory}/parallel-world/"
Expand Down Expand Up @@ -427,6 +448,15 @@
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/deps</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-aggregator_2.12</artifactId>
<classifier>spark320</classifier>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/deps</outputDirectory>
</artifactItem>
</artifactItems>
<useBaseVersion>true</useBaseVersion>
<outputDirectory>${project.build.directory}/deps</outputDirectory>
Expand Down Expand Up @@ -566,6 +596,18 @@
>
<patternset refid="excludeMeta"/>
</unzip>
<unzip
src="${project.build.directory}/deps/rapids-4-spark-aggregator_${scala.binary.version}-${project.version}-spark320.jar"
dest="${project.build.directory}/parallel-world/"
>
<patternset refid="includeMeta"/>
</unzip>
<unzip
src="${project.build.directory}/deps/rapids-4-spark-aggregator_${scala.binary.version}-${project.version}-spark320.jar"
dest="${project.build.directory}/parallel-world/spark320"
>
<patternset refid="excludeMeta"/>
</unzip>

<delete
file="${project.build.directory}/parallel-world/META-INF/services/com.nvidia.spark.rapids.SparkShimServiceProvider"
Expand Down