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/10/09 05:49:34 UTC
(polaris) branch main updated: Fix 5749 (#5752)
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 e979a4e406 Fix 5749 (#5752)
e979a4e406 is described below
commit e979a4e40643fa1f0a707f140c1ef0b55a24e82c
Author: Yong Zheng <yo...@gmail.com>
AuthorDate: Fri Oct 9 00:49:28 2026 -0500
Fix 5749 (#5752)
---
bom/build.gradle.kts | 6 +++---
build-logic/src/main/kotlin/asf/AsfProject.kt | 4 ++--
build-logic/src/main/kotlin/bom/VerifyBomDependenciesTask.kt | 4 ++--
.../src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt | 4 ++--
.../src/main/kotlin/licenses/LicenseFileValidation.kt | 8 ++++----
build-logic/src/main/kotlin/licenses/LicenseNoticeMerge.kt | 4 ++--
.../src/main/kotlin/licenses/QuarkusAppDependencyFilter.kt | 2 +-
build-logic/src/main/kotlin/polaris-java.gradle.kts | 8 ++++----
.../src/main/kotlin/polaris-license-report.gradle.kts | 2 +-
build-logic/src/main/kotlin/polaris-runtime.gradle.kts | 2 +-
.../src/main/kotlin/publishing/PublishingHelperExtension.kt | 2 +-
build-logic/src/main/kotlin/publishing/digest-task.kt | 2 +-
build-logic/src/main/kotlin/publishing/maven-utils.kt | 2 +-
build-logic/src/main/kotlin/publishing/rootProject.kt | 6 +++---
build-logic/src/main/kotlin/publishing/shadowPub.kt | 2 +-
build.gradle.kts | 6 +++---
extensions/auth/opa/build.gradle.kts | 10 +++++-----
extensions/auth/ranger/build.gradle.kts | 6 +++---
extensions/openlineage/build.gradle.kts | 4 ++--
gradle/baselibs.versions.toml | 2 +-
.../server/test/runner/PolarisServerTestRunnerExtension.kt | 2 +-
.../server/test/runner/PolarisServerTestTaskConfigurer.kt | 6 +++---
.../polaris/server/test/runner/RunningPolarisServer.kt | 6 +++---
.../server/test/runner/PolarisServerTestRunnerPluginTest.kt | 12 ++++++------
persistence/nosql/persistence/db/dynamodb/build.gradle.kts | 2 +-
persistence/nosql/persistence/db/inmemory/build.gradle.kts | 2 +-
persistence/nosql/persistence/db/mongodb/build.gradle.kts | 2 +-
plugins/spark/v3.5/spark/build.gradle.kts | 8 ++++----
plugins/spark/v4.0/spark/build.gradle.kts | 8 ++++----
runtime/admin/build.gradle.kts | 2 +-
runtime/server/build.gradle.kts | 2 +-
runtime/service/build.gradle.kts | 2 +-
runtime/spark-tests/build.gradle.kts | 2 +-
settings.gradle.kts | 4 ++--
tools/config-docs/generator/build.gradle.kts | 2 +-
35 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
index 6fd5b864c2..95b089fae9 100644
--- a/bom/build.gradle.kts
+++ b/bom/build.gradle.kts
@@ -137,10 +137,10 @@ tasks.register<VerifyBomDependenciesTask>("verifyBomDependencies") {
description = "Checks if the BOM dependencies are complete"
bomDependencyCoordinates.set(
- configurations.api.map { it.dependencyConstraints.map { "${it.group}:${it.name}" } }
+ configurations.api.map { it.dependencyConstraints.map { "${it.group}:${it.name}" } },
)
projectCoordinatesByPath.set(
- provider { rootProject.allprojects.associate { it.path to "${it.group}:${it.name}" } }
+ provider { rootProject.allprojects.associate { it.path to "${it.group}:${it.name}" } },
)
excludedProjectPaths.set(
setOf(
@@ -148,7 +148,7 @@ tasks.register<VerifyBomDependenciesTask>("verifyBomDependencies") {
":aggregated-license-report",
":polaris-config-docs-site",
":polaris-distribution",
- )
+ ),
)
}
diff --git a/build-logic/src/main/kotlin/asf/AsfProject.kt b/build-logic/src/main/kotlin/asf/AsfProject.kt
index 70f1e5a964..47ac36646f 100644
--- a/build-logic/src/main/kotlin/asf/AsfProject.kt
+++ b/build-logic/src/main/kotlin/asf/AsfProject.kt
@@ -120,7 +120,7 @@ class AsfProject(
val project =
projects[apacheId]
?: throw IllegalArgumentException(
- "No project '$apacheId' found in https://whimsy.apache.org/public/public_ldap_projects.json"
+ "No project '$apacheId' found in https://whimsy.apache.org/public/public_ldap_projects.json",
)
return project
}
@@ -132,7 +132,7 @@ class AsfProject(
val podling =
podlings[apacheId]
?: throw IllegalArgumentException(
- "No podling '$apacheId' found in https://whimsy.apache.org/public/public_podlings.json"
+ "No podling '$apacheId' found in https://whimsy.apache.org/public/public_podlings.json",
)
return podling
}
diff --git a/build-logic/src/main/kotlin/bom/VerifyBomDependenciesTask.kt b/build-logic/src/main/kotlin/bom/VerifyBomDependenciesTask.kt
index a63fa44a24..66d65c9744 100644
--- a/build-logic/src/main/kotlin/bom/VerifyBomDependenciesTask.kt
+++ b/build-logic/src/main/kotlin/bom/VerifyBomDependenciesTask.kt
@@ -52,12 +52,12 @@ abstract class VerifyBomDependenciesTask : DefaultTask() {
if (missingProjectPaths.isNotEmpty()) {
logger.error(
- "The dependencies declared in the BOM might be incomplete, the following declarations might be missing:"
+ "The dependencies declared in the BOM might be incomplete, the following declarations might be missing:",
)
missingProjectPaths.forEach { logger.error(" api(project(\"$it\"))") }
throw GradleException(
- "The dependencies declared in the BOM might be incomplete, see logged errors above."
+ "The dependencies declared in the BOM might be incomplete, see logged errors above.",
)
}
}
diff --git a/build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt b/build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt
index 4842c082bf..d2cd32f530 100644
--- a/build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt
+++ b/build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt
@@ -162,7 +162,7 @@ abstract class CheckCopiedCodeMentionsExistTask : DefaultTask() {
)
throw GradleException(
- "${nonExistingMentions.size} files mentioned in $licenseFileRelative do not exist, fix the $licenseFileRelative file."
+ "${nonExistingMentions.size} files mentioned in $licenseFileRelative do not exist, fix the $licenseFileRelative file.",
)
}
}
@@ -284,7 +284,7 @@ abstract class CheckForCopiedCodeTask : DefaultTask() {
)
throw GradleException(
- "${unmentionedFiles.size} files with the $magicWord marker need to be mentioned in $licenseFileRelative. See the messages above."
+ "${unmentionedFiles.size} files with the $magicWord marker need to be mentioned in $licenseFileRelative. See the messages above.",
)
}
}
diff --git a/build-logic/src/main/kotlin/licenses/LicenseFileValidation.kt b/build-logic/src/main/kotlin/licenses/LicenseFileValidation.kt
index 5f241ae9d2..2cb60acd9e 100644
--- a/build-logic/src/main/kotlin/licenses/LicenseFileValidation.kt
+++ b/build-logic/src/main/kotlin/licenses/LicenseFileValidation.kt
@@ -103,7 +103,7 @@ class LicenseFileValidation : DependencyFilter {
--------------------------------
${missingApacheMentions.sorted().joinToString("\n") { "$LICENSE_MENTION_PREFIX$it" }}
"""
- .trimIndent()
+ .trimIndent(),
)
}
if (!missingFullMentions.isEmpty()) {
@@ -115,7 +115,7 @@ class LicenseFileValidation : DependencyFilter {
------------------------------
${missingFullMentions.toSortedMap().values.joinToString("\n") { "$LICENSE_MENTION_PREFIX$it" }}
"""
- .trimIndent()
+ .trimIndent(),
)
}
if (!superfluousDependencies.isEmpty()) {
@@ -127,12 +127,12 @@ class LicenseFileValidation : DependencyFilter {
------------------------------------------------
${superfluousDependencies.sorted().joinToString("\n") { "$LICENSE_MENTION_PREFIX$it" }}
"""
- .trimIndent()
+ .trimIndent(),
)
}
if (!missingError.isEmpty()) {
throw GradleException(
- "License information for the following artifacts is missing in the root LICENSE file: $missingError"
+ "License information for the following artifacts is missing in the root LICENSE file: $missingError",
)
}
diff --git a/build-logic/src/main/kotlin/licenses/LicenseNoticeMerge.kt b/build-logic/src/main/kotlin/licenses/LicenseNoticeMerge.kt
index d0dfbb6fb7..0fc619c2f3 100644
--- a/build-logic/src/main/kotlin/licenses/LicenseNoticeMerge.kt
+++ b/build-logic/src/main/kotlin/licenses/LicenseNoticeMerge.kt
@@ -95,7 +95,7 @@ abstract class LicenseNoticeMerge @Inject constructor(objectFactory: ObjectFacto
val header = iter.next()
if (!iter.next().isBlank()) {
errors.add(
- "* Invalid line after license block header for '$header', expected an empty line"
+ "* Invalid line after license block header for '$header', expected an empty line",
)
}
val dependencies = mutableListOf<String>()
@@ -119,7 +119,7 @@ abstract class LicenseNoticeMerge @Inject constructor(objectFactory: ObjectFacto
.reduce { key, accumulator, element ->
if (accumulator.suffix != element.suffix) {
errors.add(
- "* License information for '$key' differs across the imported LICENSE files:\n${accumulator.suffix}\n${element.suffix}\n"
+ "* License information for '$key' differs across the imported LICENSE files:\n${accumulator.suffix}\n${element.suffix}\n",
)
}
LicenseBlock(
diff --git a/build-logic/src/main/kotlin/licenses/QuarkusAppDependencyFilter.kt b/build-logic/src/main/kotlin/licenses/QuarkusAppDependencyFilter.kt
index 6be2415203..072dbec9d6 100644
--- a/build-logic/src/main/kotlin/licenses/QuarkusAppDependencyFilter.kt
+++ b/build-logic/src/main/kotlin/licenses/QuarkusAppDependencyFilter.kt
@@ -38,7 +38,7 @@ class QuarkusAppDependencyFilter : DependencyFilter {
data.project.file("build/quarkus-build/app/quarkus-app/quarkus-app-dependencies.txt")
if (!dependenciesFile.isFile) {
throw GradleException(
- "Expected Quarkus dependency inventory at '${dependenciesFile.path}'. Run quarkusAppPartsBuild before generating the license report."
+ "Expected Quarkus dependency inventory at '${dependenciesFile.path}'. Run quarkusAppPartsBuild before generating the license report.",
)
}
diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
index 4068a8770e..1177419a98 100644
--- a/build-logic/src/main/kotlin/polaris-java.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -90,7 +90,7 @@ tasks.withType<Checkstyle>().configureEach {
tasks.withType(JavaCompile::class.java).configureEach {
options.compilerArgs.addAll(
- listOf("-Xlint:unchecked", "-Xlint:deprecation", "-XDaddTypeAnnotationsToSymbol=true")
+ listOf("-Xlint:unchecked", "-Xlint:deprecation", "-XDaddTypeAnnotationsToSymbol=true"),
)
options.errorprone.disableAllWarnings = true
options.errorprone.disableWarningsInGeneratedCode = true
@@ -108,7 +108,7 @@ tasks.withType(JavaCompile::class.java).configureEach {
parameters.configFile = errorproneRules
}
service.get().errorproneConfig
- }
+ },
)
}
@@ -316,10 +316,10 @@ fun bannedDependencies(): BannedDependencies {
BannedDependenciesService::class.java,
) {
parameters.globallyBannedFile.set(
- layout.settingsDirectory.file("gradle/banned-dependencies.txt")
+ layout.settingsDirectory.file("gradle/banned-dependencies.txt"),
)
parameters.quarkusProdBannedFile.set(
- layout.settingsDirectory.file("gradle/banned-quarkus-prod-dependencies.txt")
+ layout.settingsDirectory.file("gradle/banned-quarkus-prod-dependencies.txt"),
)
}
return service.get().bannedDependencies
diff --git a/build-logic/src/main/kotlin/polaris-license-report.gradle.kts b/build-logic/src/main/kotlin/polaris-license-report.gradle.kts
index bf6ad54a2c..576ef19984 100644
--- a/build-logic/src/main/kotlin/polaris-license-report.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-license-report.gradle.kts
@@ -61,7 +61,7 @@ val generateLicenseReport =
allowedLicenses,
project.layout.projectDirectory.file("distribution/LICENSE"),
project.layout.buildDirectory.file(
- "quarkus-build/app/quarkus-app/quarkus-app-dependencies.txt"
+ "quarkus-build/app/quarkus-app/quarkus-app-dependencies.txt",
),
)
.withPathSensitivity(PathSensitivity.RELATIVE)
diff --git a/build-logic/src/main/kotlin/polaris-runtime.gradle.kts b/build-logic/src/main/kotlin/polaris-runtime.gradle.kts
index 4b8ad5c5fa..a900bb3882 100644
--- a/build-logic/src/main/kotlin/polaris-runtime.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-runtime.gradle.kts
@@ -87,7 +87,7 @@ configurations.configureEach {
if (group == "ch.qos.logback") {
throw GradleException(
"Logback dependencies are not allowed in Quarkus modules. " +
- "Found $group:$name in ${project.name}."
+ "Found $group:$name in ${project.name}.",
)
}
}
diff --git a/build-logic/src/main/kotlin/publishing/PublishingHelperExtension.kt b/build-logic/src/main/kotlin/publishing/PublishingHelperExtension.kt
index 605c9d4ee4..15eb4d6dc0 100644
--- a/build-logic/src/main/kotlin/publishing/PublishingHelperExtension.kt
+++ b/build-logic/src/main/kotlin/publishing/PublishingHelperExtension.kt
@@ -105,7 +105,7 @@ class EffectiveAsfProject(
fun codeRepoUrl(): Provider<String> =
publishingHelperExtension.overrideScm.orElse(
- githubRepoName().map { r -> "https://github.com/apache/$r" }.orElse(asfProject.repository)
+ githubRepoName().map { r -> "https://github.com/apache/$r" }.orElse(asfProject.repository),
)
fun fullName() = publishingHelperExtension.overrideName.orElse("Apache ${asfProject.name}")
diff --git a/build-logic/src/main/kotlin/publishing/digest-task.kt b/build-logic/src/main/kotlin/publishing/digest-task.kt
index 1c249b4e4c..8091302d32 100644
--- a/build-logic/src/main/kotlin/publishing/digest-task.kt
+++ b/build-logic/src/main/kotlin/publishing/digest-task.kt
@@ -71,7 +71,7 @@ abstract class GenerateDigest @Inject constructor(objectFactory: ObjectFactory)
digestFile.writeText(
md.digest().joinToString(separator = "") { eachByte -> "%02x".format(eachByte) } +
- " ${input.name}"
+ " ${input.name}",
)
}
}
diff --git a/build-logic/src/main/kotlin/publishing/maven-utils.kt b/build-logic/src/main/kotlin/publishing/maven-utils.kt
index d2e1698b3d..abe7da728b 100644
--- a/build-logic/src/main/kotlin/publishing/maven-utils.kt
+++ b/build-logic/src/main/kotlin/publishing/maven-utils.kt
@@ -65,7 +65,7 @@ abstract class GeneratePomProperties : DefaultTask() {
artifactId=${artifactId.get()}
version=${projectVersion.get()}
"""
- .trimIndent()
+ .trimIndent(),
)
}
}
diff --git a/build-logic/src/main/kotlin/publishing/rootProject.kt b/build-logic/src/main/kotlin/publishing/rootProject.kt
index b0761b01b1..d2f1255c0f 100644
--- a/build-logic/src/main/kotlin/publishing/rootProject.kt
+++ b/build-logic/src/main/kotlin/publishing/rootProject.kt
@@ -106,9 +106,9 @@ internal fun configureOnRootProject(project: Project) = project.run {
val stagingRepositoryUrlRegistryRegistration =
gradle.sharedServices.registrations.named<
- BuildServiceRegistration<StagingRepositoryDescriptorRegistryBuildService, *>
+ BuildServiceRegistration<StagingRepositoryDescriptorRegistryBuildService, *>,
>(
- "stagingRepositoryUrlRegistry"
+ "stagingRepositoryUrlRegistry",
)
val stagingRepoUrl =
if (stagingRepositoryUrlRegistryRegistration.isPresent) {
@@ -199,7 +199,7 @@ internal fun configureOnRootProject(project: Project) = project.run {
$emailBody
"""
- .trimIndent()
+ .trimIndent(),
)
bodyFile.writeText(emailBody.trimIndent())
}
diff --git a/build-logic/src/main/kotlin/publishing/shadowPub.kt b/build-logic/src/main/kotlin/publishing/shadowPub.kt
index a2a1dcfb1c..a31fe2fc9e 100644
--- a/build-logic/src/main/kotlin/publishing/shadowPub.kt
+++ b/build-logic/src/main/kotlin/publishing/shadowPub.kt
@@ -86,7 +86,7 @@ internal fun configureShadowPublishing(
}
}
component.addVariantsFromConfiguration(
- project.configurations.getByName("shadowRuntimeElements")
+ project.configurations.getByName("shadowRuntimeElements"),
) {
if (isPublishable(configurationVariant)) {
mapToMavenScope("runtime")
diff --git a/build.gradle.kts b/build.gradle.kts
index 892b362b3a..47e3a5340f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -107,7 +107,7 @@ tasks.named<RatTask>("rat").configure {
// Binary files
excludes.add(
- "persistence/nosql/persistence/index/src/testFixtures/resources/org/apache/polaris/persistence/indexes/words.gz"
+ "persistence/nosql/persistence/index/src/testFixtures/resources/org/apache/polaris/persistence/indexes/words.gz",
)
// Polaris service startup banner
@@ -257,7 +257,7 @@ changelog {
"Deprecations",
"Fixes",
"Commits",
- )
+ ),
)
version.set(provider { project.version.toString() })
}
@@ -267,7 +267,7 @@ tasks.register("showVersion") {
description = "Show the Polaris version"
actions.add {
logger.lifecycle(
- "Polaris version is ${project.file("version.txt").readText(Charsets.UTF_8).trim()}"
+ "Polaris version is ${project.file("version.txt").readText(Charsets.UTF_8).trim()}",
)
}
}
diff --git a/extensions/auth/opa/build.gradle.kts b/extensions/auth/opa/build.gradle.kts
index 3560f7cbc0..5a810a5512 100644
--- a/extensions/auth/opa/build.gradle.kts
+++ b/extensions/auth/opa/build.gradle.kts
@@ -180,7 +180,7 @@ tasks.register<JavaExec>("validateOpaSchema") {
|
|${logFile.get().asFile.readText()}
"""
- .trimMargin()
+ .trimMargin(),
)
}
@@ -203,7 +203,7 @@ tasks.register<JavaExec>("validateOpaSchema") {
|Committed file: ${committedSchemaFile.absolutePath}
|Generated file: ${tempSchemaFile.absolutePath}
"""
- .trimMargin()
+ .trimMargin(),
)
}
@@ -245,11 +245,11 @@ fun Test.configureOpaTestTask(
"polaris.features.\"SUPPORTED_CATALOG_STORAGE_TYPES\"" to "[\"FILE\"]",
"polaris.features.\"ALLOW_INSECURE_STORAGE_TYPES\"" to "true",
"polaris.readiness.ignore-severe-issues" to "true",
- )
+ ),
)
staticToken?.let {
systemProperties.putAll(
- mapOf("polaris.authorization.opa.auth.bearer.static-token.value" to it)
+ mapOf("polaris.authorization.opa.auth.bearer.static-token.value" to it),
)
}
fileTokenPath?.orNull?.let {
@@ -257,7 +257,7 @@ fun Test.configureOpaTestTask(
mapOf(
"polaris.authorization.opa.auth.bearer.file-based.path" to it,
opaBearerTokenRefreshIntervalProperty to "PT1S",
- )
+ ),
)
}
}
diff --git a/extensions/auth/ranger/build.gradle.kts b/extensions/auth/ranger/build.gradle.kts
index fd94d8e061..56bec7bffe 100644
--- a/extensions/auth/ranger/build.gradle.kts
+++ b/extensions/auth/ranger/build.gradle.kts
@@ -49,7 +49,7 @@ val generateAuthzItTestFixture =
layout.projectDirectory.file("src/intTest/resources/authz_it_tests/dev_polaris_roles.json")
val userStoreFile =
layout.projectDirectory.file(
- "src/intTest/resources/authz_it_tests/dev_polaris_userstore.json"
+ "src/intTest/resources/authz_it_tests/dev_polaris_userstore.json",
)
val outputDir = layout.buildDirectory.dir("generated/resources/intTest/authz_it_tests")
inputs.file(polarisRangerServiceDefFile)
@@ -176,7 +176,7 @@ testing {
providers.environmentVariable("AWS_REGION").orElse("us-west-2"),
)
environment.putAll(
- mapOf("POLARIS_BOOTSTRAP_CREDENTIALS" to "POLARIS,test-admin,test-secret")
+ mapOf("POLARIS_BOOTSTRAP_CREDENTIALS" to "POLARIS,test-admin,test-secret"),
)
systemProperties.putAll(
mapOf(
@@ -192,7 +192,7 @@ testing {
"polaris.features.\"SUPPORTED_CATALOG_STORAGE_TYPES\"" to "[\"FILE\"]",
"polaris.features.\"ALLOW_INSECURE_STORAGE_TYPES\"" to "true",
"polaris.readiness.ignore-severe-issues" to "true",
- )
+ ),
)
}
}
diff --git a/extensions/openlineage/build.gradle.kts b/extensions/openlineage/build.gradle.kts
index 732d924a35..6d6f0c3d17 100644
--- a/extensions/openlineage/build.gradle.kts
+++ b/extensions/openlineage/build.gradle.kts
@@ -119,7 +119,7 @@ testing {
providers.environmentVariable("AWS_REGION").orElse("us-west-2"),
)
environment.putAll(
- mapOf("POLARIS_BOOTSTRAP_CREDENTIALS" to "POLARIS,test-admin,test-secret")
+ mapOf("POLARIS_BOOTSTRAP_CREDENTIALS" to "POLARIS,test-admin,test-secret"),
)
systemProperties.putAll(
mapOf(
@@ -127,7 +127,7 @@ testing {
"polaris.features.\"SUPPORTED_CATALOG_STORAGE_TYPES\"" to "[\"FILE\"]",
"polaris.features.\"ALLOW_INSECURE_STORAGE_TYPES\"" to "true",
"polaris.readiness.ignore-severe-issues" to "true",
- )
+ ),
)
}
}
diff --git a/gradle/baselibs.versions.toml b/gradle/baselibs.versions.toml
index 081fc1e5ce..e7563b577e 100644
--- a/gradle/baselibs.versions.toml
+++ b/gradle/baselibs.versions.toml
@@ -24,4 +24,4 @@ jandex = { module = "org.kordamp.gradle:jandex-gradle-plugin", version = "2.3.0"
license-report = { module = "com.github.jk1:gradle-license-report", version = "3.1.4" }
nexus-publish = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "9.6.1" }
-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.10.3" }
+spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.10.4" }
diff --git a/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerExtension.kt b/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerExtension.kt
index 24452ec92a..823b5ebaa0 100644
--- a/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerExtension.kt
+++ b/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerExtension.kt
@@ -118,7 +118,7 @@ constructor(project: Project, internal val service: Provider<PolarisServerTestSe
}
internal fun PolarisServerTestRunnerExtension.conventionFrom(
- other: PolarisServerTestRunnerExtension
+ other: PolarisServerTestRunnerExtension,
) {
server.setFrom(other.server)
startupActionClasspath.setFrom(other.startupActionClasspath)
diff --git a/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestTaskConfigurer.kt b/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestTaskConfigurer.kt
index 2478341c01..56df9ad8d4 100644
--- a/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestTaskConfigurer.kt
+++ b/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestTaskConfigurer.kt
@@ -59,14 +59,14 @@ internal fun Test.configurePolarisServer(extension: PolarisServerTestRunnerExten
startupAction = null
}
}
- }
+ },
)
doFirst {
val files = extension.server.files
if (files.size != 1) {
throw GradleException(
- "Expected exactly one Polaris server artifact, but found ${files.size}: $files"
+ "Expected exactly one Polaris server artifact, but found ${files.size}: $files",
)
}
val jar = files.single()
@@ -164,7 +164,7 @@ private class IsolatedPolarisServerStartupAction(
try {
withContextClassLoader(classLoader) {
action.start(
- DefaultPolarisServerStartupContext(parameters, systemProperties, environment)
+ DefaultPolarisServerStartupContext(parameters, systemProperties, environment),
)
}
} catch (e: Throwable) {
diff --git a/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/RunningPolarisServer.kt b/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/RunningPolarisServer.kt
index 5dae2f13f4..ee92381654 100644
--- a/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/RunningPolarisServer.kt
+++ b/gradle/server-test-runner/src/main/kotlin/org/apache/polaris/server/test/runner/RunningPolarisServer.kt
@@ -61,7 +61,7 @@ internal class RunningPolarisServer(
companion object {
private val listenPattern =
Regex(
- "^.*Listening on: (https?://\\S+?)(?:[.] Management interface listening on (https?://\\S+?)[.])?\\s*$"
+ "^.*Listening on: (https?://\\S+?)(?:[.] Management interface listening on (https?://\\S+?)[.])?\\s*$",
)
fun start(
@@ -141,7 +141,7 @@ internal class RunningPolarisServer(
if (!ready.await(startupTimeout.toMillis(), TimeUnit.MILLISECONDS)) {
process.destroyForcibly()
throw GradleException(
- "Polaris server did not emit a listen URL within $startupTimeout. Captured output:\n${capturedOutput(capturedOutput)}"
+ "Polaris server did not emit a listen URL within $startupTimeout. Captured output:\n${capturedOutput(capturedOutput)}",
)
}
@@ -152,7 +152,7 @@ internal class RunningPolarisServer(
if (process.isAlive) "still running" else "exited with code ${process.exitValue()}"
process.destroyForcibly()
throw GradleException(
- "Polaris server $exit before emitting a listen URL. Captured output:\n${capturedOutput(capturedOutput)}"
+ "Polaris server $exit before emitting a listen URL. Captured output:\n${capturedOutput(capturedOutput)}",
)
}
diff --git a/gradle/server-test-runner/src/test/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerPluginTest.kt b/gradle/server-test-runner/src/test/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerPluginTest.kt
index 627a02e3d7..f6d8cd29df 100644
--- a/gradle/server-test-runner/src/test/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerPluginTest.kt
+++ b/gradle/server-test-runner/src/test/kotlin/org/apache/polaris/server/test/runner/PolarisServerTestRunnerPluginTest.kt
@@ -120,7 +120,7 @@ class PolarisServerTestRunnerPluginTest {
}
}
"""
- .trimIndent()
+ .trimIndent(),
)
writeFakeServer()
writePropertyTest()
@@ -155,7 +155,7 @@ class PolarisServerTestRunnerPluginTest {
withPolarisServer(files())
}
"""
- .trimIndent()
+ .trimIndent(),
)
writePropertyTest()
@@ -201,7 +201,7 @@ class PolarisServerTestRunnerPluginTest {
}
}
"""
- .trimIndent()
+ .trimIndent(),
)
writeFakeServer("Listening on: http://0.0.0.0")
writePropertyTest()
@@ -223,7 +223,7 @@ class PolarisServerTestRunnerPluginTest {
private fun writeFakeServer(
listenLine: String =
- "Listening on: http://0.0.0.0:12345. Management interface listening on http://0.0.0.0:12346."
+ "Listening on: http://0.0.0.0:12345. Management interface listening on http://0.0.0.0:12346.",
) {
val sourceDir = projectDir.resolve("src/main/java/test").createDirectories()
sourceDir
@@ -258,7 +258,7 @@ class PolarisServerTestRunnerPluginTest {
}
}
"""
- .trimIndent()
+ .trimIndent(),
)
}
@@ -282,7 +282,7 @@ class PolarisServerTestRunnerPluginTest {
}
}
"""
- .trimIndent()
+ .trimIndent(),
)
}
diff --git a/persistence/nosql/persistence/db/dynamodb/build.gradle.kts b/persistence/nosql/persistence/db/dynamodb/build.gradle.kts
index 6788053672..625bc4d08e 100644
--- a/persistence/nosql/persistence/db/dynamodb/build.gradle.kts
+++ b/persistence/nosql/persistence/db/dynamodb/build.gradle.kts
@@ -41,7 +41,7 @@ val quarkusRuntimeElements =
}
(components["java"] as AdhocComponentWithVariants).addVariantsFromConfiguration(
- quarkusRuntimeElements.get()
+ quarkusRuntimeElements.get(),
) {}
dependencies {
diff --git a/persistence/nosql/persistence/db/inmemory/build.gradle.kts b/persistence/nosql/persistence/db/inmemory/build.gradle.kts
index 2b042fd68e..368a7ddea4 100644
--- a/persistence/nosql/persistence/db/inmemory/build.gradle.kts
+++ b/persistence/nosql/persistence/db/inmemory/build.gradle.kts
@@ -43,7 +43,7 @@ val quarkusRuntimeElements =
}
(components["java"] as AdhocComponentWithVariants).addVariantsFromConfiguration(
- quarkusRuntimeElements.get()
+ quarkusRuntimeElements.get(),
) {}
dependencies {
diff --git a/persistence/nosql/persistence/db/mongodb/build.gradle.kts b/persistence/nosql/persistence/db/mongodb/build.gradle.kts
index 380548a015..54a5a25f08 100644
--- a/persistence/nosql/persistence/db/mongodb/build.gradle.kts
+++ b/persistence/nosql/persistence/db/mongodb/build.gradle.kts
@@ -43,7 +43,7 @@ val quarkusRuntimeElements =
}
(components["java"] as AdhocComponentWithVariants).addVariantsFromConfiguration(
- quarkusRuntimeElements.get()
+ quarkusRuntimeElements.get(),
) {}
dependencies {
diff --git a/plugins/spark/v3.5/spark/build.gradle.kts b/plugins/spark/v3.5/spark/build.gradle.kts
index 4913367445..ff3a89bdae 100644
--- a/plugins/spark/v3.5/spark/build.gradle.kts
+++ b/plugins/spark/v3.5/spark/build.gradle.kts
@@ -30,7 +30,7 @@ checkstyle {
configProperties =
mapOf(
"org.checkstyle.google.suppressionfilter.config" to
- project.file("checkstyle_suppressions.xml").absolutePath
+ project.file("checkstyle_suppressions.xml").absolutePath,
)
}
@@ -57,7 +57,7 @@ dependencies {
implementation(project(":polaris-core")) { isTransitive = false }
implementation(
- "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}"
+ "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}",
)
compileOnly("org.scala-lang:scala-library:${scalaLibraryVersion}")
@@ -82,7 +82,7 @@ dependencies {
testImplementation(libs.mockito.core)
testImplementation(
- "org.apache.iceberg:iceberg-spark-runtime-3.5_${scalaVersion}:${icebergVersion}"
+ "org.apache.iceberg:iceberg-spark-runtime-3.5_${scalaVersion}:${icebergVersion}",
)
testImplementation("org.apache.spark:spark-sql_${scalaVersion}:${spark35Version}") {
// exclude log4j dependencies
@@ -98,7 +98,7 @@ testing {
register<JvmTestSuite>("intTest") {
dependencies {
implementation(
- "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}"
+ "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}",
)
implementation(project(":polaris-api-management-model"))
diff --git a/plugins/spark/v4.0/spark/build.gradle.kts b/plugins/spark/v4.0/spark/build.gradle.kts
index 9f20eebee6..718c3d967f 100644
--- a/plugins/spark/v4.0/spark/build.gradle.kts
+++ b/plugins/spark/v4.0/spark/build.gradle.kts
@@ -30,7 +30,7 @@ checkstyle {
configProperties =
mapOf(
"org.checkstyle.google.suppressionfilter.config" to
- project.file("checkstyle_suppressions.xml").absolutePath
+ project.file("checkstyle_suppressions.xml").absolutePath,
)
}
@@ -52,7 +52,7 @@ dependencies {
implementation(project(":polaris-core")) { isTransitive = false }
implementation(
- "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}"
+ "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}",
)
compileOnly("org.scala-lang:scala-library:${scalaLibraryVersion}")
@@ -77,7 +77,7 @@ dependencies {
testImplementation(libs.mockito.core)
testImplementation(
- "org.apache.iceberg:iceberg-spark-runtime-4.0_${scalaVersion}:${icebergVersion}"
+ "org.apache.iceberg:iceberg-spark-runtime-4.0_${scalaVersion}:${icebergVersion}",
)
testImplementation("org.apache.spark:spark-sql_${scalaVersion}:${spark40Version}") {
// exclude log4j dependencies
@@ -94,7 +94,7 @@ testing {
register<JvmTestSuite>("intTest") {
dependencies {
implementation(
- "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}"
+ "org.apache.iceberg:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersion}:${icebergVersion}",
)
implementation(project(":polaris-api-management-model"))
diff --git a/runtime/admin/build.gradle.kts b/runtime/admin/build.gradle.kts
index 4f646cac7e..bc9d9182b9 100644
--- a/runtime/admin/build.gradle.kts
+++ b/runtime/admin/build.gradle.kts
@@ -104,7 +104,7 @@ quarkus {
.attributes
.map { e -> "quarkus.package.jar.manifest.attributes.\"${e.key}\"" to e.value.toString() }
.toMap()
- }
+ },
)
buildForkOptions {
maxHeapSize = "2G"
diff --git a/runtime/server/build.gradle.kts b/runtime/server/build.gradle.kts
index da3e75f9ab..81b031c386 100644
--- a/runtime/server/build.gradle.kts
+++ b/runtime/server/build.gradle.kts
@@ -80,7 +80,7 @@ quarkus {
.attributes
.map { e -> "quarkus.package.jar.manifest.attributes.\"${e.key}\"" to e.value.toString() }
.toMap()
- }
+ },
)
buildForkOptions {
maxHeapSize = "2G"
diff --git a/runtime/service/build.gradle.kts b/runtime/service/build.gradle.kts
index fa8ebc01c7..0f15a4ad19 100644
--- a/runtime/service/build.gradle.kts
+++ b/runtime/service/build.gradle.kts
@@ -261,7 +261,7 @@ tasks.withType(Test::class.java).configureEach {
// JVM arguments provider does not interfere with Gradle's cache keys
jvmArgumentProviders.add(
- IntTestArgumentProvider(logsDir, quarkusProperties, quarkusTestArgLine)
+ IntTestArgumentProvider(logsDir, quarkusProperties, quarkusTestArgLine),
)
// delete files from previous runs
diff --git a/runtime/spark-tests/build.gradle.kts b/runtime/spark-tests/build.gradle.kts
index 534b080a46..dd925ea8c7 100644
--- a/runtime/spark-tests/build.gradle.kts
+++ b/runtime/spark-tests/build.gradle.kts
@@ -175,7 +175,7 @@ fun Test.configureSparkIntegrationTestTask(
"polaris.features.\"ALLOW_DROPPING_NON_EMPTY_PASSTHROUGH_FACADE_CATALOG\"" to "true",
"polaris.features.\"ALLOW_EXTERNAL_CATALOG_CREDENTIAL_VENDING\"" to "true",
"polaris.features.\"ALLOW_FEDERATED_CATALOGS_CREDENTIAL_VENDING\"" to "true",
- )
+ ),
)
storageAccessKey?.let { systemProperties.put("polaris.storage.aws.access-key", it) }
storageSecretKey?.let { systemProperties.put("polaris.storage.aws.secret-key", it) }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fa0de9f280..b1a808a93d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,7 +33,7 @@ if (isCI) {
gradle.serviceOf<BuildFeatures>().configurationCache.requested.getOrElse(false)
if (configurationCacheRequested) {
throw GradleException(
- "Gradle configuration cache must not be enabled in CI because it can persist build configuration state to disk."
+ "Gradle configuration cache must not be enabled in CI because it can persist build configuration state to disk.",
)
}
}
@@ -51,7 +51,7 @@ if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
The Apache Polaris build requires Java 21.
Detected Java version: ${JavaVersion.current()}
- """
+ """,
)
}
diff --git a/tools/config-docs/generator/build.gradle.kts b/tools/config-docs/generator/build.gradle.kts
index a408f13c85..6b41e81738 100644
--- a/tools/config-docs/generator/build.gradle.kts
+++ b/tools/config-docs/generator/build.gradle.kts
@@ -64,7 +64,7 @@ tasks.named<Test>("test") {
}
private class ConfigDocsGenCommandLineArgumentProvider(
- @get:Classpath val libraries: Provider<List<File>>
+ @get:Classpath val libraries: Provider<List<File>>,
) : CommandLineArgumentProvider {
override fun asArguments(): Iterable<String> {
return listOf("-Dtesting.libraries=" + libraries.get().joinToString(":"))