This is an automated email from the ASF dual-hosted git repository.
snazy 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 faf8f1c7 Build: move version-decls from polaris-quarkus-service to
libs.versions.toml (#744)
faf8f1c7 is described below
commit faf8f1c758aa76f4b49d3060e2fdd936218c1f63
Author: Robert Stupp <[email protected]>
AuthorDate: Tue Jan 14 14:59:25 2025 +0100
Build: move version-decls from polaris-quarkus-service to
libs.versions.toml (#744)
---
gradle/libs.versions.toml | 7 +++++++
quarkus/service/build.gradle.kts | 12 +++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1b3a5970..9662cc8d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,6 +24,8 @@ junit = "5.11.4"
quarkus = "3.17.6"
immutables = "2.10.1"
picocli = "4.7.6"
+scala212 = "2.12.19"
+spark35 = "3.5.4"
slf4j = "2.0.16"
swagger = "1.6.14"
@@ -35,6 +37,7 @@ swagger = "1.6.14"
# If a dependency is removed, check whether the LICENSE and/or NOTICE files
need to be adopted
# (aka mention of the dependency removed).
#
+antlr4-runtime = { module = "org.antlr:antlr4-runtime", version.strictly =
"4.9.3" } # spark integration tests
assertj-core = { module = "org.assertj:assertj-core", version = "3.27.2" }
auth0-jwt = { module = "com.auth0:java-jwt", version = "4.4.0" }
awssdk-bom = { module = "software.amazon.awssdk:bom", version = "2.29.50" }
@@ -55,6 +58,7 @@ hadoop-client-api = { module =
"org.apache.hadoop:hadoop-client-api", version.re
hadoop-client-runtime = { module = "org.apache.hadoop:hadoop-client-runtime",
version.ref = "hadoop" }
hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref =
"hadoop" }
hadoop-hdfs-client = { module = "org.apache.hadoop:hadoop-hdfs-client",
version.ref = "hadoop" }
+hawkular-agent-prometheus-scraper = { module =
"org.hawkular.agent:prometheus-scraper", version = "0.23.0.Final" }
immutables-builder = { module = "org.immutables:builder", version.ref =
"immutables" }
immutables-value-annotations = { module = "org.immutables:value-annotations",
version.ref = "immutables" }
immutables-value-processor = { module = "org.immutables:value-processor",
version.ref = "immutables" }
@@ -83,10 +87,13 @@ picocli = { module = "info.picocli:picocli-codegen",
version.ref = "picocli" }
picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref =
"picocli" }
prometheus-metrics-exporter-servlet-jakarta = { module =
"io.prometheus:prometheus-metrics-exporter-servlet-jakarta", version = "1.3.5" }
quarkus-bom = { module = "io.quarkus.platform:quarkus-bom", version.ref =
"quarkus" }
+scala212-lang-library = { module = "org.scala-lang:scala-library", version.ref
= "scala212" }
+scala212-lang-reflect = { module = "org.scala-lang:scala-reflect", version.ref
= "scala212" }
s3mock-testcontainers = { module = "com.adobe.testing:s3mock-testcontainers",
version = "3.12.0" }
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
smallrye-common-annotation = { module =
"io.smallrye.common:smallrye-common-annotation", version = "2.9.0" }
smallrye-config-core = { module = "io.smallrye.config:smallrye-config-core",
version = "3.11.1" }
+spark35-sql-scala212 = { module = "org.apache.spark:spark-sql_2.12",
version.ref = "spark35" }
spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations",
version = "4.8.6" }
swagger-annotations = { module = "io.swagger:swagger-annotations", version.ref
= "swagger" }
swagger-jaxrs = { module = "io.swagger:swagger-jaxrs", version.ref = "swagger"
}
diff --git a/quarkus/service/build.gradle.kts b/quarkus/service/build.gradle.kts
index a49c8326..aea4bd37 100644
--- a/quarkus/service/build.gradle.kts
+++ b/quarkus/service/build.gradle.kts
@@ -95,7 +95,7 @@ dependencies {
testImplementation("org.apache.iceberg:iceberg-spark-3.5_2.12")
testImplementation("org.apache.iceberg:iceberg-spark-extensions-3.5_2.12")
- testImplementation("org.apache.spark:spark-sql_2.12:3.5.4") {
+ testImplementation(libs.spark35.sql.scala212) {
// exclude log4j dependencies
exclude("org.apache.logging.log4j", "log4j-slf4j2-impl")
exclude("org.apache.logging.log4j", "log4j-api")
@@ -119,14 +119,12 @@ dependencies {
testImplementation(libs.s3mock.testcontainers)
// required for PolarisSparkIntegrationTest
- testImplementation(enforcedPlatform("org.scala-lang:scala-library:2.12.18"))
- testImplementation(enforcedPlatform("org.scala-lang:scala-reflect:2.12.18"))
+ testImplementation(enforcedPlatform(libs.scala212.lang.library))
+ testImplementation(enforcedPlatform(libs.scala212.lang.reflect))
testImplementation(libs.javax.servlet.api)
- testImplementation(
- enforcedPlatform("org.antlr:antlr4-runtime:4.9.3")
- ) // cannot be higher than 4.9.3
+ testImplementation(libs.antlr4.runtime)
- testImplementation("org.hawkular.agent:prometheus-scraper:0.23.0.Final")
+ testImplementation(libs.hawkular.agent.prometheus.scraper)
}
tasks.withType(Test::class.java).configureEach {
