Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/mvn-verify-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
svArrBodyNoSnapshot=${svArrBodyNoSnapshot:1}

# get private artifact version
privateVer=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-private.version -DforceStdout)
privateVer=$(mvn help:evaluate -q -pl dist -Dexpression=cudf-spark-private.version -DforceStdout)
# do not add empty snapshot versions or when private version is released one (does not include snapshot shims)
if [[ ${#SPARK_SHIM_VERSIONS_SNAPSHOTS_ONLY[@]} -gt 0 && $privateVer == *"-SNAPSHOT" ]]; then
svArrBodySnapshot=$(printf ",{\"spark-version\":\"%s\",\"isSnapshot\":true}" "${SPARK_SHIM_VERSIONS_SNAPSHOTS_ONLY[@]}")
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
svArrBodyNoSnapshot=$(printf ",{\"spark-version\":\"%s\",\"isSnapshot\":false}" "${SPARK_SHIM_VERSIONS_NOSNAPSHOTS[@]}")
svArrBodyNoSnapshot=${svArrBodyNoSnapshot:1}
# get private artifact version
privateVer=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-private.version -DforceStdout)
privateVer=$(mvn help:evaluate -q -pl dist -Dexpression=cudf-spark-private.version -DforceStdout)
svJsonStr=$(printf {\"include\":[%s]} $svArrBodyNoSnapshot)

echo "scala213Versions=$svJsonStr" >> $GITHUB_OUTPUT
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mvn-verify-check/get-deps-sha1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ set -e
scala_ver=${1:-"2.12"}
base_URL="https://central.sonatype.com/repository/maven-snapshots/com/nvidia"
project_jni="spark-rapids-jni"
project_private="rapids-4-spark-private_${scala_ver}"
project_private="cudf-spark-private_${scala_ver}"

jni_ver=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-jni.version -DforceStdout)
private_ver=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-private.version -DforceStdout)
private_ver=$(mvn help:evaluate -q -pl dist -Dexpression=cudf-spark-private.version -DforceStdout)

get_latest_snapshot_version() {
local project_URL="$1"
Expand Down
4 changes: 2 additions & 2 deletions aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
</dependency>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-private_${scala.binary.version}</artifactId>
<version>${spark-rapids-private.version}</version>
<artifactId>cudf-spark-private_${scala.binary.version}</artifactId>
<version>${cudf-spark-private.version}</version>
<classifier>${spark.version.classifier}</classifier>
</dependency>
<!--
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@
<cuda.version>cuda12</cuda.version>
<jni.classifier>${cuda.version}</jni.classifier>
<spark-rapids-jni.version>26.10.0-SNAPSHOT</spark-rapids-jni.version>
<spark-rapids-private.version>26.10.0-SNAPSHOT</spark-rapids-private.version>
<cudf-spark-private.version>26.10.0-SNAPSHOT</cudf-spark-private.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.recompileMode>incremental</scala.recompileMode>
<scala.version>2.12.21</scala.version>
Expand Down
4 changes: 2 additions & 2 deletions scala2.13/aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
</dependency>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-private_${scala.binary.version}</artifactId>
<version>${spark-rapids-private.version}</version>
<artifactId>cudf-spark-private_${scala.binary.version}</artifactId>
<version>${cudf-spark-private.version}</version>
<classifier>${spark.version.classifier}</classifier>
</dependency>
<!--
Expand Down
2 changes: 1 addition & 1 deletion scala2.13/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@
<cuda.version>cuda12</cuda.version>
<jni.classifier>${cuda.version}</jni.classifier>
<spark-rapids-jni.version>26.10.0-SNAPSHOT</spark-rapids-jni.version>
<spark-rapids-private.version>26.10.0-SNAPSHOT</spark-rapids-private.version>
<cudf-spark-private.version>26.10.0-SNAPSHOT</cudf-spark-private.version>
<scala.binary.version>2.13</scala.binary.version>
<scala.recompileMode>incremental</scala.recompileMode>
<scala.version>2.13.18</scala.version>
Expand Down
4 changes: 2 additions & 2 deletions scala2.13/sql-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
</dependency>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-private_${scala.binary.version}</artifactId>
<version>${spark-rapids-private.version}</version>
<artifactId>cudf-spark-private_${scala.binary.version}</artifactId>
<version>${cudf-spark-private.version}</version>
<classifier>${spark.version.classifier}</classifier>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions sql-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
</dependency>
<dependency>
<groupId>com.nvidia</groupId>
<artifactId>rapids-4-spark-private_${scala.binary.version}</artifactId>
<version>${spark-rapids-private.version}</version>
<artifactId>cudf-spark-private_${scala.binary.version}</artifactId>
<version>${cudf-spark-private.version}</version>
<classifier>${spark.version.classifier}</classifier>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ object RapidsPluginUtils extends Logging {
val CUDF_PROPS_FILENAME = "cudf-java-version-info.properties"
val JNI_PROPS_FILENAME = "spark-rapids-jni-version-info.properties"
val PLUGIN_PROPS_FILENAME = "rapids4spark-version-info.properties"
private val PRIVATE_PROPS_FILENAME = "rapids4spark-private-version-info.properties"
private val PRIVATE_PROPS_FILENAME = "cudf-spark-private-version-info.properties"

private val SQL_PLUGIN_NAME = classOf[SQLExecPlugin].getName
private val UDF_PLUGIN_NAME = "com.nvidia.spark.udf.Plugin"
Expand Down
Loading