You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by yz...@apache.org on 2026/05/22 13:37:50 UTC
(polaris) branch main updated: Update scala212 to v2.12.21 and update renovate to ensure update is between 2.12.x (#4501)
This is an automated email from the ASF dual-hosted git repository.
MonkeyCanCode pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new 961372f92e Update scala212 to v2.12.21 and update renovate to ensure update is between 2.12.x (#4501)
961372f92e is described below
commit 961372f92e89623941e39c376d8716dd99567630
Author: Yong Zheng <yo...@gmail.com>
AuthorDate: Fri May 22 08:37:45 2026 -0500
Update scala212 to v2.12.21 and update renovate to ensure update is between 2.12.x (#4501)
---
.github/renovate.json5 | 14 +++++++++++++
gradle/libs.versions.toml | 4 +++-
plugins/pluginlibs.versions.toml | 24 ----------------------
plugins/spark/README.md | 8 ++++----
.../getting-started/notebooks/SparkPolaris.ipynb | 2 +-
plugins/spark/v3.5/integration/build.gradle.kts | 8 ++++----
plugins/spark/v3.5/spark/build.gradle.kts | 8 ++++----
settings.gradle.kts | 5 -----
8 files changed, 30 insertions(+), 43 deletions(-)
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index ab0c7d4ded..2a5b47f9b0 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -107,6 +107,20 @@
matchManagers: ["github-actions"],
matchPackageNames: ["python"],
enabled: false
+ },
+ // Scala 2.12 and 2.13 are not compatible
+ // Ensure that Renovate does not "upgrade" from 2.12 to 2.13
+ {
+ matchManagers: ["gradle"],
+ matchPackageNames: [ "org.scala-lang:*" ],
+ matchCurrentVersion: "/^2\\.12\\./",
+ allowedVersions: "/^2\\.12\\./"
+ },
+ {
+ matchManagers: ["gradle"],
+ matchPackageNames: [ "org.scala-lang:*" ],
+ matchCurrentVersion: "/^2\\.13\\./",
+ allowedVersions: "/^2\\.13\\./"
}
],
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e6696a7f85..852edf7314 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,9 @@ picocli = "4.7.7"
quarkus = "3.35.3"
ranger = "2.8.0"
ranger-graalvm = "25.0.3"
-scala212 = "2.12.19"
+scala212 = "2.12.21"
+scala213 = "2.13.18"
+spark35 = "3.5.6"
swagger = "1.6.16"
[bundles]
diff --git a/plugins/pluginlibs.versions.toml b/plugins/pluginlibs.versions.toml
deleted file mode 100644
index 06ec2cebfd..0000000000
--- a/plugins/pluginlibs.versions.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-[versions]
-iceberg = "1.11.0"
-spark35 = "3.5.6"
-scala212 = "2.12.19"
-scala213 = "2.13.15"
diff --git a/plugins/spark/README.md b/plugins/spark/README.md
index a43c9c376f..84425a9914 100644
--- a/plugins/spark/README.md
+++ b/plugins/spark/README.md
@@ -25,7 +25,7 @@ REST endpoints, and provides implementations for Apache Spark's
- [ViewCatalog](https://github.com/apache/spark/blob/v3.5.6/sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/ViewCatalog.java)
- [SupportsNamespaces](https://github.com/apache/spark/blob/v3.5.6/sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/SupportsNamespaces.java)
-Right now, the plugin only provides support for Spark 3.5, Scala version 2.12 and 2.13, and depends on iceberg-spark-runtime 1.9.1.
+Right now, the plugin only provides support for Spark 3.5, Scala version 2.12 and 2.13, and depends on iceberg-spark-runtime 1.11.0.
The Polaris Spark client supports catalog management for both Iceberg and Delta tables. It routes all Iceberg table
requests to the Iceberg REST endpoints and routes all Delta table requests to the Generic Table REST endpoints.
@@ -54,7 +54,7 @@ Run the following command to build the Polaris Spark project and publish the sou
```shell
bin/spark-shell \
---packages org.apache.polaris:polaris-spark-<spark_version>_<scala_version>:<polaris_version>,org.apache.iceberg:iceberg-aws-bundle:1.10.0,io.delta:delta-spark_2.12:3.3.1 \
+--packages org.apache.polaris:polaris-spark-<spark_version>_<scala_version>:<polaris_version>,org.apache.iceberg:iceberg-aws-bundle:1.11.0,io.delta:delta-spark_2.12:3.3.1 \
--conf spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions,io.delta.sql.DeltaSparkSessionExtension \
--conf spark.sql.catalog.spark_catalog=org.apache.spark.sql.delta.catalog.DeltaCatalog \
--conf spark.sql.catalog.<catalog-name>.warehouse=<catalog-name> \
@@ -77,7 +77,7 @@ The Spark command would look like following:
```shell
bin/spark-shell \
---packages org.apache.polaris:polaris-spark-3.5_2.12:1.2.0-incubating-SNAPSHOT,org.apache.iceberg:iceberg-aws-bundle:1.10.0,io.delta:delta-spark_2.12:3.3.1 \
+--packages org.apache.polaris:polaris-spark-3.5_2.12:1.2.0-incubating-SNAPSHOT,org.apache.iceberg:iceberg-aws-bundle:1.11.0,io.delta:delta-spark_2.12:3.3.1 \
--conf spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions,io.delta.sql.DeltaSparkSessionExtension \
--conf spark.sql.catalog.spark_catalog=org.apache.spark.sql.delta.catalog.DeltaCatalog \
--conf spark.sql.catalog.polaris.warehouse=polaris \
@@ -103,7 +103,7 @@ To start Spark using the bundle JAR, specify it with the `--jars` option as show
```shell
bin/spark-shell \
--jars <path-to-spark-client-jar> \
---packages org.apache.iceberg:iceberg-aws-bundle:1.10.0,io.delta:delta-spark_2.12:3.3.1 \
+--packages org.apache.iceberg:iceberg-aws-bundle:1.11.0,io.delta:delta-spark_2.12:3.3.1 \
--conf spark.sql.extensions=org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions,io.delta.sql.DeltaSparkSessionExtension \
--conf spark.sql.catalog.spark_catalog=org.apache.spark.sql.delta.catalog.DeltaCatalog \
--conf spark.sql.catalog.<catalog-name>.warehouse=<catalog-name> \
diff --git a/plugins/spark/v3.5/getting-started/notebooks/SparkPolaris.ipynb b/plugins/spark/v3.5/getting-started/notebooks/SparkPolaris.ipynb
index 226a42920c..cc2f62ddb2 100644
--- a/plugins/spark/v3.5/getting-started/notebooks/SparkPolaris.ipynb
+++ b/plugins/spark/v3.5/getting-started/notebooks/SparkPolaris.ipynb
@@ -267,7 +267,7 @@
"spark = (SparkSession.builder\n",
" # This jar is now automatically discovered, thus no longer needed\n",
" #.config(\"spark.jars\", \"../polaris_libs/polaris-spark-3.5_2.12-1.2.0-incubating-SNAPSHOT-bundle.jar\")\n",
- " .config(\"spark.jars.packages\", \"org.apache.iceberg:iceberg-aws-bundle:1.10.0,io.delta:delta-spark_2.12:3.2.1\")\n",
+ " .config(\"spark.jars.packages\", \"org.apache.iceberg:iceberg-aws-bundle:1.11.0,io.delta:delta-spark_2.12:3.2.1\")\n",
" .config(\"spark.sql.catalog.spark_catalog\", \"org.apache.spark.sql.delta.catalog.DeltaCatalog\")\n",
" .config('spark.sql.iceberg.vectorization.enabled', 'false')\n",
"\n",
diff --git a/plugins/spark/v3.5/integration/build.gradle.kts b/plugins/spark/v3.5/integration/build.gradle.kts
index fd63e27b02..8d0a344b52 100644
--- a/plugins/spark/v3.5/integration/build.gradle.kts
+++ b/plugins/spark/v3.5/integration/build.gradle.kts
@@ -26,13 +26,13 @@ plugins {
// get version information
val sparkMajorVersion = "3.5"
val scalaVersion = getAndUseScalaVersionForProject()
-val icebergVersion = pluginlibs.versions.iceberg.get()
-val spark35Version = pluginlibs.versions.spark35.get()
+val icebergVersion = libs.versions.iceberg.get()
+val spark35Version = libs.versions.spark35.get()
val scalaLibraryVersion =
if (scalaVersion == "2.12") {
- pluginlibs.versions.scala212.get()
+ libs.versions.scala212.get()
} else {
- pluginlibs.versions.scala213.get()
+ libs.versions.scala213.get()
}
dependencies {
diff --git a/plugins/spark/v3.5/spark/build.gradle.kts b/plugins/spark/v3.5/spark/build.gradle.kts
index 5feb457107..ae5c0609fb 100644
--- a/plugins/spark/v3.5/spark/build.gradle.kts
+++ b/plugins/spark/v3.5/spark/build.gradle.kts
@@ -32,14 +32,14 @@ checkstyle {
// get version information
val sparkMajorVersion = "3.5"
val scalaVersion = getAndUseScalaVersionForProject()
-val icebergVersion = pluginlibs.versions.iceberg.get()
-val spark35Version = pluginlibs.versions.spark35.get()
+val icebergVersion = libs.versions.iceberg.get()
+val spark35Version = libs.versions.spark35.get()
val scalaLibraryVersion =
if (scalaVersion == "2.12") {
- pluginlibs.versions.scala212.get()
+ libs.versions.scala212.get()
} else {
- pluginlibs.versions.scala213.get()
+ libs.versions.scala213.get()
}
dependencies {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ae87a166df..a8bfb86cc7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -140,11 +140,6 @@ dependencyResolutionManagement {
}
}
-dependencyResolutionManagement {
- // version catalog used by the polaris plugin code, such as polaris-spark-3.5
- versionCatalogs { create("pluginlibs") { from(files("plugins/pluginlibs.versions.toml")) } }
-}
-
gradle.beforeProject {
version = baseVersion
group = "org.apache.polaris"