From 9bb61ef9272878748b36a660c385303b4fd8e17a Mon Sep 17 00:00:00 2001 From: Robert Stupp Date: Sun, 11 Sep 2022 10:16:14 -0700 Subject: [PATCH] WIP Migrate to Gradle version catalogs / project changes Replaces all "platform"s with a single version catalog. --- clients/antlr-runtime/build.gradle.kts | 8 ++-- clients/client/build.gradle.kts | 41 ++++++++--------- clients/deltalake/build.gradle.kts | 23 +++++----- clients/iceberg-views/build.gradle.kts | 40 ++++++++++++----- clients/spark-antlr-grammar/build.gradle.kts | 3 +- .../spark-extensions-base/build.gradle.kts | 2 +- .../build.gradle.kts | 20 ++++----- clients/spark-extensions/build.gradle.kts | 24 +++++----- compatibility/common/build.gradle.kts | 31 +++++++------ .../compatibility-tests/build.gradle.kts | 17 +++---- compatibility/jersey/build.gradle.kts | 19 ++++---- gc/gc-base-tests/build.gradle.kts | 15 +++---- gc/gc-base/build.gradle.kts | 45 ++++++++----------- gc/gc-repository-jdbc/build.gradle.kts | 44 ++++++++---------- model/build.gradle.kts | 27 +++++------ perftest/gatling/build.gradle.kts | 3 +- perftest/simulations/build.gradle.kts | 13 +++--- servers/jax-rs-testextension/build.gradle.kts | 15 +++---- servers/jax-rs-tests/build.gradle.kts | 27 +++++------ servers/jax-rs/build.gradle.kts | 17 ++++--- servers/lambda/build.gradle.kts | 15 +++---- servers/quarkus-cli/build.gradle.kts | 39 +++++++--------- servers/quarkus-common/build.gradle.kts | 13 +++--- servers/quarkus-server/build.gradle.kts | 21 ++++----- servers/quarkus-tests/build.gradle.kts | 16 +++---- servers/rest-services/build.gradle.kts | 27 ++++++----- servers/services/build.gradle.kts | 31 ++++++------- servers/store-proto/build.gradle.kts | 4 +- servers/store/build.gradle.kts | 19 ++++---- tools/content-generator/build.gradle.kts | 28 ++++++------ ui/build.gradle.kts | 2 +- versioned/persist/adapter/build.gradle.kts | 34 +++++++------- versioned/persist/bench/build.gradle.kts | 21 ++++----- .../persist/dynamodb-test/build.gradle.kts | 9 ++-- versioned/persist/dynamodb/build.gradle.kts | 17 +++---- versioned/persist/inmem/build.gradle.kts | 15 +++---- .../persist/mongodb-test/build.gradle.kts | 5 +-- versioned/persist/mongodb/build.gradle.kts | 18 +++----- versioned/persist/nontx-test/build.gradle.kts | 7 ++- versioned/persist/nontx/build.gradle.kts | 13 +++--- versioned/persist/rocks/build.gradle.kts | 20 ++++----- .../persist/serialize-proto/build.gradle.kts | 4 +- versioned/persist/serialize/build.gradle.kts | 9 ++-- versioned/persist/store/build.gradle.kts | 12 ++--- .../persist/testextension/build.gradle.kts | 7 ++- versioned/persist/tests/build.gradle.kts | 19 ++++---- versioned/persist/tx-test/build.gradle.kts | 26 +++++------ versioned/persist/tx/build.gradle.kts | 34 ++++++-------- versioned/spi/build.gradle.kts | 43 +++++++++--------- versioned/tests/build.gradle.kts | 23 +++++----- versioned/transfer-proto/build.gradle.kts | 4 +- versioned/transfer/build.gradle.kts | 34 +++++++------- 52 files changed, 465 insertions(+), 558 deletions(-) diff --git a/clients/antlr-runtime/build.gradle.kts b/clients/antlr-runtime/build.gradle.kts index 6edf26d8e13..f92383a7a41 100644 --- a/clients/antlr-runtime/build.gradle.kts +++ b/clients/antlr-runtime/build.gradle.kts @@ -20,16 +20,14 @@ plugins { `java-library` `maven-publish` signing - id("com.github.johnrengelman.shadow") `nessie-conventions` } +applyShadowJar() + extra["maven.name"] = "Nessie - Antlr Runtime" -dependencies { - implementation(nessieProjectPlatform("nessie-deps-antlr", gradle)) - implementation("org.antlr:antlr4-runtime") -} +dependencies { implementation(libs.antlr.antlr4.runtime) } tasks.named("shadowJar") { dependencies { include(dependency("org.antlr:antlr4-runtime")) } diff --git a/clients/client/build.gradle.kts b/clients/client/build.gradle.kts index 175c726578f..22683f896ff 100644 --- a/clients/client/build.gradle.kts +++ b/clients/client/build.gradle.kts @@ -25,8 +25,6 @@ plugins { extra["maven.name"] = "Nessie - Client" dependencies { - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(platform(rootProject)) api(project(":nessie-model")) @@ -49,38 +47,37 @@ dependencies { version { strictly(jacksonVersion) } } } else { - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jackson.bom)) implementation("com.fasterxml.jackson.core:jackson-core") implementation("com.fasterxml.jackson.core:jackson-annotations") implementation("com.fasterxml.jackson.core:jackson-databind") } - implementation("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") - implementation("javax.ws.rs:javax.ws.rs-api") - implementation("com.google.code.findbugs:jsr305") - compileOnly("com.google.errorprone:error_prone_annotations") + implementation(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) + implementation(libs.javax.ws.rs) + implementation(libs.findbugs.jsr305) + compileOnly(libs.errorprone.annotations) - compileOnly("org.immutables:builder") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + compileOnly(libs.immutables.builder) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) - testImplementation("com.google.guava:guava") - testImplementation("org.bouncycastle:bcprov-jdk15on") - testImplementation("org.bouncycastle:bcpkix-jdk15on") - testImplementation("org.mockito:mockito-core") + testImplementation(libs.guava) + testImplementation(libs.bouncycastle.bcprov) + testImplementation(libs.bouncycastle.bcpkix) + testImplementation(libs.mockito.core) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - compileOnly("io.quarkus:quarkus-smallrye-opentracing") - compileOnly("software.amazon.awssdk:auth") - testImplementation("io.quarkus:quarkus-smallrye-opentracing") - testImplementation("software.amazon.awssdk:auth") + compileOnly(libs.quarkus.smallrye.opentracing) + compileOnly(libs.awssdk.auth) + testImplementation(libs.quarkus.smallrye.opentracing) + testImplementation(libs.awssdk.auth) } jandex { skipDefaultProcessing() } diff --git a/clients/deltalake/build.gradle.kts b/clients/deltalake/build.gradle.kts index 4542e83d650..300472b732f 100644 --- a/clients/deltalake/build.gradle.kts +++ b/clients/deltalake/build.gradle.kts @@ -21,11 +21,12 @@ plugins { `maven-publish` signing scala - id("com.github.johnrengelman.shadow") - id("org.projectnessie") + alias(libs.plugins.nessie.run) `nessie-conventions` } +applyShadowJar() + val sparkScala = useSparkScalaVersionsForProject("3.2") dependencies { @@ -33,7 +34,6 @@ dependencies { forScala(sparkScala.scalaVersion) implementation(platform(nessieRootProject())) - implementation(nessieProjectPlatform("nessie-deps-iceberg", gradle)) implementation(nessieProject("nessie-model")) implementation(nessieProject("nessie-client")) @@ -43,11 +43,11 @@ dependencies { implementation("org.apache.spark:spark-sql_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } - implementation("io.delta:delta-core_${sparkScala.scalaMajorVersion}") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + implementation(libs.delta.core) + compileOnly(libs.microprofile.openapi) + compileOnly(libs.errorprone.annotations) - testImplementation(nessieProjectPlatform("nessie-deps-testing", gradle)) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation( nessieProject( @@ -58,11 +58,12 @@ dependencies { "com.fasterxml.jackson.module:jackson-module-scala_${sparkScala.scalaMajorVersion}" ) testImplementation("com.fasterxml.jackson.core:jackson-databind") - testImplementation("org.eclipse.microprofile.openapi:microprofile-openapi-api") - testImplementation("ch.qos.logback:logback-classic") - testImplementation("org.slf4j:log4j-over-slf4j") + testImplementation(libs.microprofile.openapi) + testImplementation(libs.logback.classic) + testImplementation(libs.slf4j.log4j.over.slf4j) + testCompileOnly(libs.errorprone.annotations) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/clients/iceberg-views/build.gradle.kts b/clients/iceberg-views/build.gradle.kts index 7fc317ea7e0..edfcf56d239 100644 --- a/clients/iceberg-views/build.gradle.kts +++ b/clients/iceberg-views/build.gradle.kts @@ -24,20 +24,38 @@ plugins { dependencies { implementation(platform(nessieRootProject())) - implementation(nessieProjectPlatform("nessie-deps-iceberg", gradle)) implementation(nessieProject("nessie-client")) implementation(nessieProject("nessie-model")) - implementation("org.apache.iceberg:iceberg-api") - implementation("org.apache.iceberg:iceberg-core") - implementation("org.apache.iceberg:iceberg-common") + implementation( + group = "org.apache.iceberg", + name = "iceberg-api", + version = dependencyVersion("versionIceberg") + ) + implementation( + group = "org.apache.iceberg", + name = "iceberg-core", + version = dependencyVersion("versionIceberg") + ) + implementation( + group = "org.apache.iceberg", + name = "iceberg-common", + version = dependencyVersion("versionIceberg") + ) implementation( "org.apache.iceberg", "iceberg-bundled-guava", + version = dependencyVersion("versionIceberg"), configuration = if (isIntegrationsTestingEnabled()) "shadow" else null ) - implementation("org.apache.iceberg:iceberg-nessie") { exclude("org.projectnessie", "*") } - implementation("org.apache.hadoop:hadoop-client") { + implementation( + group = "org.apache.iceberg", + name = "iceberg-nessie", + version = dependencyVersion("versionIceberg") + ) { + exclude("org.projectnessie", "*") + } + implementation(libs.hadoop.client) { exclude("javax.servlet.jsp", "jsp-api") exclude("javax.ws.rs", "javax.ws.rs-api") exclude("log4j", "log4j") @@ -46,17 +64,17 @@ dependencies { exclude("com.sun.jersey", "jersey-servlet") exclude("org.apache.hadoop", "hadoop-client") } - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + compileOnly(libs.microprofile.openapi) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(nessieProject("nessie-versioned-persist-testextension")) testImplementation(nessieProject("nessie-versioned-persist-in-memory")) testImplementation(nessieProject("nessie-jaxrs-testextension")) - testImplementation("org.slf4j:log4j-over-slf4j") - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testImplementation(libs.slf4j.log4j.over.slf4j) + testCompileOnly(libs.microprofile.openapi) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/clients/spark-antlr-grammar/build.gradle.kts b/clients/spark-antlr-grammar/build.gradle.kts index 1f03a4433d2..711266d58c2 100644 --- a/clients/spark-antlr-grammar/build.gradle.kts +++ b/clients/spark-antlr-grammar/build.gradle.kts @@ -23,8 +23,7 @@ plugins { } dependencies { - antlr(nessieProjectPlatform("nessie-deps-antlr", gradle)) - antlr("org.antlr:antlr4") + antlr(libs.antlr.antlr4) api(platform(nessieRootProject())) api(project(":nessie-spark-antlr-runtime", "shadow")) diff --git a/clients/spark-extensions-base/build.gradle.kts b/clients/spark-extensions-base/build.gradle.kts index 449d4efea5e..fa35b3cab38 100644 --- a/clients/spark-extensions-base/build.gradle.kts +++ b/clients/spark-extensions-base/build.gradle.kts @@ -33,6 +33,6 @@ dependencies { compileOnly("org.apache.spark:spark-hive_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + compileOnly(libs.microprofile.openapi) implementation(nessieClientForIceberg()) } diff --git a/clients/spark-extensions-basetests/build.gradle.kts b/clients/spark-extensions-basetests/build.gradle.kts index 7d02c0fe697..958ca474f98 100644 --- a/clients/spark-extensions-basetests/build.gradle.kts +++ b/clients/spark-extensions-basetests/build.gradle.kts @@ -28,27 +28,25 @@ dependencies { forScala(sparkScala.scalaVersion) implementation(platform(nessieRootProject())) - implementation(nessieProjectPlatform("nessie-deps-testing", gradle)) - compileOnly(nessieProjectPlatform("nessie-deps-build-only", gradle)) - annotationProcessor(nessieProjectPlatform("nessie-deps-build-only", gradle)) - implementation(platform("org.junit:junit-bom")) + implementation(platform(libs.junit.bom)) implementation(nessieProject("nessie-spark-extensions-grammar")) compileOnly("org.apache.spark:spark-hive_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - implementation(nessieClientForIceberg()) - implementation("org.apache.spark:spark-sql_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } - implementation("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + implementation(nessieClientForIceberg()) + + implementation(libs.microprofile.openapi) + + compileOnly(libs.errorprone.annotations) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) - implementation("org.assertj:assertj-core") + implementation(libs.assertj.core) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") } diff --git a/clients/spark-extensions/build.gradle.kts b/clients/spark-extensions/build.gradle.kts index d69b6e99f12..6a141cf22b2 100644 --- a/clients/spark-extensions/build.gradle.kts +++ b/clients/spark-extensions/build.gradle.kts @@ -21,11 +21,12 @@ plugins { `maven-publish` signing scala - id("com.github.johnrengelman.shadow") - id("org.projectnessie") + alias(libs.plugins.nessie.run) `nessie-conventions` } +applyShadowJar() + val sparkScala = getSparkScalaVersionsForProject() dependencies { @@ -33,7 +34,6 @@ dependencies { forScala(sparkScala.scalaVersion) implementation(platform(nessieRootProject())) - compileOnly(nessieProjectPlatform("nessie-deps-iceberg", gradle)) implementation(project(":nessie-spark-extensions-grammar")) implementation(project(":nessie-spark-extensions-base_${sparkScala.scalaMajorVersion}")) @@ -42,24 +42,22 @@ dependencies { compileOnly("org.apache.spark:spark-hive_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } implementation(nessieClientForIceberg()) - testImplementation(nessieProjectPlatform("nessie-deps-testing", gradle)) - testImplementation(nessieProjectPlatform("nessie-deps-iceberg", gradle)) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-spark-extensions-basetests_${sparkScala.scalaMajorVersion}")) - testImplementation("org.apache.iceberg:iceberg-nessie") - testImplementation("org.apache.iceberg:iceberg-spark-${sparkScala.sparkMajorVersion}_${sparkScala.scalaMajorVersion}") + testImplementation(group = "org.apache.iceberg", name = "iceberg-nessie", version = dependencyVersion("versionIceberg")) + testImplementation(group = "org.apache.iceberg", name = "iceberg-spark-${sparkScala.sparkMajorVersion}_${sparkScala.scalaMajorVersion}", version = dependencyVersion("versionIceberg")) testImplementation( - "org.apache.iceberg:iceberg-spark-extensions-${sparkScala.sparkMajorVersion}_${sparkScala.scalaMajorVersion}" + group = "org.apache.iceberg", name = "iceberg-spark-extensions-${sparkScala.sparkMajorVersion}_${sparkScala.scalaMajorVersion}", version = dependencyVersion("versionIceberg") ) - testImplementation("org.apache.iceberg:iceberg-hive-metastore") - testImplementation("ch.qos.logback:logback-classic") - testImplementation("org.slf4j:log4j-over-slf4j") + testImplementation(group = "org.apache.iceberg", name = "iceberg-hive-metastore", version = dependencyVersion("versionIceberg")) + testImplementation(libs.logback.classic) + testImplementation(libs.slf4j.log4j.over.slf4j) testImplementation("org.apache.spark:spark-sql_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } testImplementation("org.apache.spark:spark-core_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } testImplementation("org.apache.spark:spark-hive_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) } - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/compatibility/common/build.gradle.kts b/compatibility/common/build.gradle.kts index aa153eca3df..962615082e4 100644 --- a/compatibility/common/build.gradle.kts +++ b/compatibility/common/build.gradle.kts @@ -26,33 +26,32 @@ extra["maven.name"] = "Nessie - Backward Compatibility - Common" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("com.fasterxml.jackson:jackson-bom")) - implementation(platform("org.junit:junit-bom")) + implementation(platform(libs.jackson.bom)) + implementation(platform(libs.junit.bom)) api(project(":nessie-client")) api(project(":nessie-compatibility-jersey")) implementation(project(":nessie-services")) implementation(project(":nessie-versioned-persist-adapter")) - implementation(platform("org.glassfish.jersey:jersey-bom")) - api("org.slf4j:slf4j-api") - api("ch.qos.logback:logback-classic") - implementation("org.apache.maven:maven-resolver-provider") - implementation("org.apache.maven.resolver:maven-resolver-connector-basic") - implementation("org.apache.maven.resolver:maven-resolver-transport-file") - implementation("org.apache.maven.resolver:maven-resolver-transport-http") - implementation("com.google.guava:guava") - implementation("jakarta.enterprise:jakarta.enterprise.cdi-api") - implementation("org.eclipse.microprofile.openapi:microprofile-openapi-api") + implementation(platform(libs.jersey.bom)) + api(libs.slf4j.api) + api(libs.logback.classic) + implementation(libs.maven.resolver.provider) + implementation(libs.maven.resolver.connector.basic) + implementation(libs.maven.resolver.transport.file) + implementation(libs.maven.resolver.transport.http) + implementation(libs.guava) + implementation(libs.jakarta.enterprise.cdi.api) + implementation(libs.microprofile.openapi) implementation("com.fasterxml.jackson.core:jackson-annotations") api("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-engine") implementation("org.junit.platform:junit-platform-launcher") - testImplementation("org.mockito:mockito-core") - testImplementation("com.google.guava:guava") + testImplementation(libs.mockito.core) + testImplementation(libs.guava) testImplementation(project(":nessie-versioned-persist-non-transactional-test")) testImplementation(project(":nessie-versioned-persist-in-memory")) testImplementation(project(":nessie-versioned-persist-in-memory-test")) @@ -65,7 +64,7 @@ dependencies { } tasks.withType().configureEach { - systemProperty("rocksdb.version", dependencyVersion("versionRocksDb")) + systemProperty("rocksdb.version", libs.versions.rocksdb.get()) filter { // Exclude test-classes for the tests excludeTestsMatching("TestNessieCompatibilityExtensions\$*") diff --git a/compatibility/compatibility-tests/build.gradle.kts b/compatibility/compatibility-tests/build.gradle.kts index 20d210ec1db..5e0574562d1 100644 --- a/compatibility/compatibility-tests/build.gradle.kts +++ b/compatibility/compatibility-tests/build.gradle.kts @@ -26,25 +26,22 @@ extra["maven.name"] = "Nessie - Backward Compatibility - Tests" dependencies { implementation(platform(rootProject)) - implementation(platform("com.fasterxml.jackson:jackson-bom")) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("org.junit:junit-bom")) + implementation(platform(libs.jackson.bom)) + implementation(platform(libs.junit.bom)) - implementation(platform("org.junit:junit-bom")) - implementation(platform("com.fasterxml.jackson:jackson-bom")) - implementation("org.assertj:assertj-core") + implementation(libs.assertj.core) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") implementation(project(":nessie-compatibility-common")) implementation(project(":nessie-client")) - implementation("org.eclipse.microprofile.openapi:microprofile-openapi-api") + implementation(libs.microprofile.openapi) implementation("com.fasterxml.jackson.core:jackson-annotations") - implementation("org.assertj:assertj-core") + implementation(libs.assertj.core) implementation("org.junit.jupiter:junit-jupiter-api") - testImplementation("com.google.guava:guava") + testImplementation(libs.guava) testImplementation(project(":nessie-versioned-persist-adapter")) testImplementation(project(":nessie-versioned-persist-non-transactional")) testImplementation(project(":nessie-versioned-persist-in-memory")) @@ -56,6 +53,6 @@ dependencies { } tasks.withType().configureEach { - systemProperty("rocksdb.version", dependencyVersion("versionRocksDb")) + systemProperty("rocksdb.version", libs.versions.rocksdb.get()) systemProperty("junit.jupiter.extensions.autodetection.enabled", "true") } diff --git a/compatibility/jersey/build.gradle.kts b/compatibility/jersey/build.gradle.kts index e8c33c68354..3fb6a655214 100644 --- a/compatibility/jersey/build.gradle.kts +++ b/compatibility/jersey/build.gradle.kts @@ -26,9 +26,8 @@ extra["maven.name"] = "Nessie - Backward Compatibility - Jersey" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("org.glassfish.jersey:jersey-bom")) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jersey.bom)) + implementation(platform(libs.jackson.bom)) implementation( platform("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle") ) @@ -41,11 +40,11 @@ dependencies { implementation(project(":nessie-versioned-persist-store")) implementation(project(":nessie-versioned-persist-testextension")) implementation(project(":nessie-versioned-spi")) - implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec") - implementation("jakarta.enterprise:jakarta.enterprise.cdi-api") - implementation("jakarta.annotation:jakarta.annotation-api") - implementation("jakarta.validation:jakarta.validation-api") - implementation("javax.ws.rs:javax.ws.rs-api") + implementation(libs.javax.ws.rs21) + implementation(libs.jakarta.enterprise.cdi.api) + implementation(libs.jakarta.annotation.api) + implementation(libs.jakarta.validation.api) + implementation(libs.javax.ws.rs) implementation("com.fasterxml.jackson.core:jackson-databind") implementation("org.glassfish.jersey.core:jersey-server") implementation("org.glassfish.jersey.inject:jersey-hk2") @@ -57,7 +56,7 @@ dependencies { implementation("org.glassfish.jersey.test-framework:jersey-test-framework-core") implementation("org.glassfish.jersey.test-framework:jersey-test-framework-util") implementation("com.fasterxml.jackson.core:jackson-annotations") - implementation("org.eclipse.microprofile.openapi:microprofile-openapi-api") + implementation(libs.microprofile.openapi) implementation( "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2" @@ -82,5 +81,5 @@ dependencies { } tasks.withType().configureEach { - systemProperty("rocksdb.version", dependencyVersion("versionRocksDb")) + systemProperty("rocksdb.version", libs.versions.rocksdb.get()) } diff --git a/gc/gc-base-tests/build.gradle.kts b/gc/gc-base-tests/build.gradle.kts index 2f51654009b..92165f3eb84 100644 --- a/gc/gc-base-tests/build.gradle.kts +++ b/gc/gc-base-tests/build.gradle.kts @@ -25,21 +25,18 @@ extra["maven.name"] = "Nessie - GC - Base Implementation Tests" dependencies { implementation(platform(nessieRootProject())) - compileOnly(nessieProjectPlatform("nessie-deps-build-only", gradle)) - annotationProcessor(nessieProjectPlatform("nessie-deps-build-only", gradle)) - implementation(nessieProjectPlatform("nessie-deps-testing", gradle)) - implementation(platform("org.junit:junit-bom")) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.junit.bom)) + compileOnly(platform(libs.jackson.bom)) implementation(nessieProject("nessie-model")) implementation(nessieProject("nessie-gc-base")) - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("com.google.code.findbugs:jsr305") + compileOnly(libs.findbugs.jsr305) - implementation("org.assertj:assertj-core") + implementation(libs.assertj.core) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") } diff --git a/gc/gc-base/build.gradle.kts b/gc/gc-base/build.gradle.kts index 52e8069e4bb..fc457bae6ac 100644 --- a/gc/gc-base/build.gradle.kts +++ b/gc/gc-base/build.gradle.kts @@ -29,46 +29,39 @@ description = dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + compileOnly(platform(libs.jackson.bom)) - compileOnly("com.google.errorprone:error_prone_annotations") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + compileOnly(libs.errorprone.annotations) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) implementation(project(":nessie-client")) - implementation("org.slf4j:slf4j-api") - implementation("com.google.guava:guava") - implementation("org.agrona:agrona:${dependencyVersion("versionAgrona")}") + implementation(libs.slf4j.api) + implementation(libs.guava) + implementation(libs.agrona) - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("com.google.code.findbugs:jsr305") + compileOnly(libs.findbugs.jsr305) - testImplementation(platform(project(":nessie-deps-testing"))) - testCompileOnly(platform("com.fasterxml.jackson:jackson-bom")) - testImplementation(platform("org.junit:junit-bom")) - testCompileOnly(platform(project(":nessie-deps-build-only"))) - testAnnotationProcessor(platform(project(":nessie-deps-build-only"))) + testCompileOnly(platform(libs.jackson.bom)) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-gc-base-tests")) testImplementation(project(":nessie-jaxrs-testextension")) - testRuntimeOnly("ch.qos.logback:logback-classic") + testRuntimeOnly(libs.logback.classic) - testCompileOnly("jakarta.validation:jakarta.validation-api") - testCompileOnly("org.immutables:value-annotations") - testAnnotationProcessor("org.immutables:value-processor") + testCompileOnly(libs.jakarta.validation.api) + testCompileOnly(libs.immutables.value.annotations) + testAnnotationProcessor(libs.immutables.value.processor) testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) - testRuntimeOnly("ch.qos.logback:logback-classic") - - testImplementation("org.mockito:mockito-core") - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) + testImplementation(libs.mockito.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/gc/gc-repository-jdbc/build.gradle.kts b/gc/gc-repository-jdbc/build.gradle.kts index 8d55769be62..d3ad3a9f0db 100644 --- a/gc/gc-repository-jdbc/build.gradle.kts +++ b/gc/gc-repository-jdbc/build.gradle.kts @@ -26,48 +26,42 @@ extra["maven.name"] = "Nessie - GC - JDBC live-contents-set persistence" dependencies { implementation(platform(nessieRootProject())) - implementation(platform(project(":nessie-deps-persist"))) - compileOnly(nessieProjectPlatform("nessie-deps-build-only", gradle)) - annotationProcessor(nessieProjectPlatform("nessie-deps-build-only", gradle)) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + compileOnly(platform(libs.jackson.bom)) - compileOnly("com.google.errorprone:error_prone_annotations") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - compileOnly("org.jetbrains", "annotations") + compileOnly(libs.errorprone.annotations) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + compileOnly(libs.jetbrains.annotations) implementation(nessieProject("nessie-model")) implementation(nessieProject("nessie-gc-base")) - implementation("com.google.guava:guava") + implementation(libs.guava) - implementation("io.agroal:agroal-pool") - implementation("org.postgresql:postgresql") - implementation("com.h2database:h2") + implementation(libs.agroal.pool) + implementation(libs.postgresql) + implementation(libs.h2) - implementation("org.slf4j:slf4j-api") + implementation(libs.slf4j.api) - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("com.google.code.findbugs:jsr305") + compileOnly(libs.findbugs.jsr305) - testImplementation(nessieProjectPlatform("nessie-deps-testing", gradle)) - testImplementation(platform("com.fasterxml.jackson:jackson-bom")) - testImplementation(platform("org.junit:junit-bom")) - testCompileOnly(nessieProjectPlatform("nessie-deps-build-only", gradle)) - testAnnotationProcessor(nessieProjectPlatform("nessie-deps-build-only", gradle)) + testImplementation(platform(libs.jackson.bom)) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-gc-base-tests")) - testRuntimeOnly("ch.qos.logback:logback-classic") + testRuntimeOnly(libs.logback.classic) - testImplementation("com.google.guava:guava") + testImplementation(libs.guava) testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/model/build.gradle.kts b/model/build.gradle.kts index 3b5a66f9c14..69a86847e71 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -21,33 +21,30 @@ plugins { jacoco `maven-publish` signing - id("org.projectnessie.smallrye-open-api") + alias(libs.plugins.nessie.build.smallrye.open.api) `nessie-conventions` } dependencies { - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(platform(rootProject)) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jackson.bom)) implementation("com.fasterxml.jackson.core:jackson-databind") implementation("com.fasterxml.jackson.core:jackson-annotations") - implementation("javax.ws.rs:javax.ws.rs-api") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") - implementation("com.google.code.findbugs:jsr305") + implementation(libs.javax.ws.rs) + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) + implementation(libs.findbugs.jsr305) - compileOnly("org.immutables:builder") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + compileOnly(libs.immutables.builder) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - testImplementation("org.assertj:assertj-core") + testCompileOnly(libs.microprofile.openapi) + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/perftest/gatling/build.gradle.kts b/perftest/gatling/build.gradle.kts index 93ebbb8a9e5..417b308f736 100644 --- a/perftest/gatling/build.gradle.kts +++ b/perftest/gatling/build.gradle.kts @@ -32,11 +32,10 @@ dependencies { forScala(scalaVersion) implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) implementation(project(":nessie-model")) implementation(project(":nessie-client")) - implementation("io.gatling.highcharts:gatling-charts-highcharts") { + implementation(libs.gatling.charts.highcharts) { exclude("io.netty", "netty-tcnative-boringssl-static") exclude("commons-logging", "commons-logging") } diff --git a/perftest/simulations/build.gradle.kts b/perftest/simulations/build.gradle.kts index fa83e75d8a3..dcb014bbcf4 100644 --- a/perftest/simulations/build.gradle.kts +++ b/perftest/simulations/build.gradle.kts @@ -19,26 +19,25 @@ import io.gatling.gradle.GatlingRunTask plugins { `maven-publish` signing - id("io.gatling.gradle") + alias(libs.plugins.gatling) `nessie-conventions` - id("org.projectnessie") + alias(libs.plugins.nessie.run) } extra["maven.name"] = "Nessie - Perf Test - Simulations" dependencies { gatling(platform(rootProject)) - gatling(platform(project(":nessie-deps-testing"))) gatling(project(":nessie-model")) gatling(project(":nessie-client")) gatling(project(":nessie-perftest-gatling")) - gatling("io.gatling.highcharts:gatling-charts-highcharts") { + gatling(libs.gatling.charts.highcharts) { exclude("io.netty", "netty-tcnative-boringssl-static") exclude("commons-logging", "commons-logging") } - gatling("org.eclipse.microprofile.openapi:microprofile-openapi-api") - gatling(platform("com.fasterxml.jackson:jackson-bom")) + gatling(libs.microprofile.openapi) + gatling(platform(libs.jackson.bom)) gatling("com.fasterxml.jackson.core:jackson-annotations") nessieQuarkusServer(project(":nessie-quarkus", "quarkusRunner")) @@ -57,7 +56,7 @@ nessieQuarkusApp { } gatling { - gatlingVersion = dependencyVersion("versionGatling") + gatlingVersion = libs.versions.gatling.get() // Null is OK (io.gatling.gradle.LogbackConfigTask checks for it) logLevel = System.getProperty("gatling.logLevel") } diff --git a/servers/jax-rs-testextension/build.gradle.kts b/servers/jax-rs-testextension/build.gradle.kts index 7bbede9c0c1..38e8d79e439 100644 --- a/servers/jax-rs-testextension/build.gradle.kts +++ b/servers/jax-rs-testextension/build.gradle.kts @@ -29,18 +29,17 @@ description = "JUnit Jupyter Extension to run tests against an \"embedded\" Ness dependencies { api(platform(rootProject)) api(project(":nessie-jaxrs")) - api(platform(project(":nessie-deps-testing"))) - api(platform("org.junit:junit-bom")) + api(platform(libs.junit.bom)) api("org.junit.jupiter:junit-jupiter-api") - api("org.slf4j:slf4j-api") - api("org.assertj:assertj-core") + api(libs.slf4j.api) + api(libs.assertj.core) - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + compileOnly(libs.microprofile.openapi) - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) - testImplementation("org.assertj:assertj-core") - testImplementation(platform("org.junit:junit-bom")) + testImplementation(libs.assertj.core) + testImplementation(platform(libs.junit.bom)) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servers/jax-rs-tests/build.gradle.kts b/servers/jax-rs-tests/build.gradle.kts index c38f6b88d92..69266665827 100644 --- a/servers/jax-rs-tests/build.gradle.kts +++ b/servers/jax-rs-tests/build.gradle.kts @@ -27,33 +27,30 @@ description = "Artifact for REST-API tests, includes Glassfish/Jersey/Weld imple dependencies { implementation(platform(rootProject)) - implementation(platform("com.fasterxml.jackson:jackson-bom")) - api(platform(project(":nessie-deps-testing"))) - api(platform("org.junit:junit-bom")) + implementation(platform(libs.jackson.bom)) + api(platform(libs.junit.bom)) implementation(project(":nessie-client")) - implementation("com.google.guava:guava") - api("io.rest-assured:rest-assured") - implementation("com.google.code.findbugs:jsr305") + implementation(libs.guava) + api(libs.rest.assured) + implementation(libs.findbugs.jsr305) - api("org.assertj:assertj-core") + api(libs.assertj.core) api("org.junit.jupiter:junit-jupiter-api") api("org.junit.jupiter:junit-jupiter-params") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) implementation("com.fasterxml.jackson.core:jackson-databind") compileOnly("com.fasterxml.jackson.core:jackson-annotations") - testImplementation(platform(project(":nessie-deps-persist"))) - testImplementation(project(":nessie-jaxrs-testextension")) - testImplementation("org.slf4j:jcl-over-slf4j") - testRuntimeOnly("com.h2database:h2") + testImplementation(libs.slf4j.jcl.over.slf4j) + testRuntimeOnly(libs.h2) - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servers/jax-rs/build.gradle.kts b/servers/jax-rs/build.gradle.kts index 2f3571148af..2f3b3bd83e1 100644 --- a/servers/jax-rs/build.gradle.kts +++ b/servers/jax-rs/build.gradle.kts @@ -28,8 +28,7 @@ description = "Nessie on Glassfish/Jersey/Weld" dependencies { api(platform(rootProject)) - api(platform(project(":nessie-deps-testing"))) - api(platform("org.glassfish.jersey:jersey-bom")) + api(platform(libs.jersey.bom)) api( platform("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle") ) @@ -56,11 +55,11 @@ dependencies { api(project(":nessie-versioned-persist-non-transactional-test")) api(project(":nessie-versioned-persist-transactional")) api(project(":nessie-versioned-persist-transactional-test")) - implementation("org.slf4j:slf4j-api") - implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec") - api("jakarta.enterprise:jakarta.enterprise.cdi-api") - api("jakarta.annotation:jakarta.annotation-api") - api("jakarta.validation:jakarta.validation-api") + implementation(libs.slf4j.api) + implementation(libs.javax.ws.rs21) + api(libs.jakarta.enterprise.cdi.api) + api(libs.jakarta.annotation.api) + api(libs.jakarta.validation.api) api("com.fasterxml.jackson.core:jackson-databind") api("org.glassfish.jersey.core:jersey-server") api("org.glassfish.jersey.inject:jersey-hk2") @@ -73,8 +72,8 @@ dependencies { api("org.glassfish.jersey.test-framework:jersey-test-framework-util") compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) api("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2") api("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory") diff --git a/servers/lambda/build.gradle.kts b/servers/lambda/build.gradle.kts index 2a8230d1bcb..cec25c3665c 100644 --- a/servers/lambda/build.gradle.kts +++ b/servers/lambda/build.gradle.kts @@ -20,7 +20,7 @@ plugins { `java-library` `maven-publish` signing - id("io.quarkus") + alias(libs.plugins.quarkus) `nessie-conventions` } @@ -33,10 +33,8 @@ val quarkusRunner by dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - implementation(platform(project(":nessie-deps-quarkus"))) - implementation(enforcedPlatform("io.quarkus:quarkus-bom")) - implementation(platform("software.amazon.awssdk:bom")) + implementation(enforcedPlatform(libs.quarkus.bom)) + implementation(platform(libs.awssdk.bom)) implementation(project(":nessie-quarkus")) { exclude("io.quarkus", "quarkus-smallrye-openapi") } implementation("io.quarkus:quarkus-amazon-lambda") @@ -47,14 +45,13 @@ dependencies { implementation("software.amazon.awssdk:netty-nio-client") implementation("software.amazon.awssdk:url-connection-client") - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation("io.quarkus:quarkus-test-amazon-lambda") testImplementation("io.quarkus:quarkus-jacoco") - testImplementation("org.mockito:mockito-core") - testImplementation("org.assertj:assertj-core") + testImplementation(libs.mockito.core) + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servers/quarkus-cli/build.gradle.kts b/servers/quarkus-cli/build.gradle.kts index 7a6a15e64cb..0cc6e906c97 100644 --- a/servers/quarkus-cli/build.gradle.kts +++ b/servers/quarkus-cli/build.gradle.kts @@ -20,21 +20,17 @@ plugins { `java-library` `maven-publish` signing - id("io.quarkus") + alias(libs.plugins.quarkus) `nessie-conventions` } extra["maven.name"] = "Nessie - Quarkus CLI" dependencies { - compileOnly(platform(project(":nessie-deps-build-only"))) implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - implementation(platform(project(":nessie-deps-quarkus"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(enforcedPlatform("io.quarkus:quarkus-bom")) - implementation(enforcedPlatform("io.quarkus.platform:quarkus-amazon-services-bom")) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(enforcedPlatform(libs.quarkus.bom)) + implementation(enforcedPlatform(libs.quarkus.amazon.services.bom)) + implementation(platform(libs.jackson.bom)) implementation(project(":nessie-quarkus-common")) implementation(project(":nessie-services")) @@ -53,34 +49,33 @@ dependencies { implementation("io.quarkus:quarkus-picocli") - implementation("com.google.protobuf:protobuf-java") + implementation(libs.protobuf.java) - implementation("com.google.code.findbugs:jsr305") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + implementation(libs.findbugs.jsr305) + compileOnly(libs.microprofile.openapi) implementation("com.fasterxml.jackson.core:jackson-databind") implementation("com.fasterxml.jackson.core:jackson-annotations") - implementation("io.agroal:agroal-pool") - implementation("com.h2database:h2") - implementation("org.postgresql:postgresql") + implementation(libs.agroal.pool) + implementation(libs.h2) + implementation(libs.postgresql) - compileOnly("org.immutables:builder") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + compileOnly(libs.immutables.builder) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-quarkus-tests")) testImplementation(project(":nessie-versioned-persist-mongodb-test")) testImplementation(project(":nessie-versioned-tests")) testImplementation("io.quarkus:quarkus-jacoco") testImplementation("io.quarkus:quarkus-junit5") - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) - testImplementation("org.assertj:assertj-core") - testImplementation("org.mockito:mockito-core") + testImplementation(libs.assertj.core) + testImplementation(libs.mockito.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servers/quarkus-common/build.gradle.kts b/servers/quarkus-common/build.gradle.kts index ef386270041..1d4443bdc84 100644 --- a/servers/quarkus-common/build.gradle.kts +++ b/servers/quarkus-common/build.gradle.kts @@ -26,10 +26,9 @@ extra["maven.name"] = "Nessie - Quarkus Common" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-quarkus"))) - implementation(enforcedPlatform("io.quarkus:quarkus-bom")) - implementation(enforcedPlatform("io.quarkus.platform:quarkus-amazon-services-bom")) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + implementation(enforcedPlatform(libs.quarkus.bom)) + implementation(enforcedPlatform(libs.quarkus.amazon.services.bom)) + compileOnly(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-server-store")) @@ -44,8 +43,8 @@ dependencies { implementation(project(":nessie-versioned-persist-mongodb")) implementation(project(":nessie-versioned-persist-transactional")) implementation("io.quarkus:quarkus-hibernate-validator") - implementation("jakarta.validation:jakarta.validation-api") - implementation("com.google.protobuf:protobuf-java") + implementation(libs.jakarta.validation.api) + implementation(libs.protobuf.java) implementation("org.jboss.slf4j:slf4j-jboss-logmanager") implementation("io.quarkus:quarkus-agroal") implementation("io.quarkus:quarkus-jdbc-postgresql") @@ -56,7 +55,7 @@ dependencies { implementation("io.quarkus:quarkus-mongodb-client") compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + compileOnly(libs.microprofile.openapi) } preferJava11() diff --git a/servers/quarkus-server/build.gradle.kts b/servers/quarkus-server/build.gradle.kts index df65a31e6ab..32351533082 100644 --- a/servers/quarkus-server/build.gradle.kts +++ b/servers/quarkus-server/build.gradle.kts @@ -20,7 +20,7 @@ plugins { `java-library` `maven-publish` signing - id("io.quarkus") + alias(libs.plugins.quarkus) `nessie-conventions` } @@ -36,11 +36,9 @@ val openapiSource by dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - implementation(platform(project(":nessie-deps-quarkus"))) - implementation(enforcedPlatform("io.quarkus:quarkus-bom")) - implementation(enforcedPlatform("io.quarkus.platform:quarkus-amazon-services-bom")) - implementation(platform("org.projectnessie.cel:cel-bom")) + implementation(enforcedPlatform(libs.quarkus.bom)) + implementation(enforcedPlatform(libs.quarkus.amazon.services.bom)) + implementation(platform(libs.cel.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-services")) @@ -60,9 +58,9 @@ dependencies { implementation("io.quarkus:quarkus-smallrye-openapi") implementation("io.quarkus:quarkus-micrometer") implementation("io.quarkus:quarkus-core-deployment") - implementation("io.quarkus:quarkus-smallrye-opentracing") + implementation(libs.quarkus.smallrye.opentracing) implementation("io.quarkus:quarkus-container-image-jib") - implementation("io.quarkiverse.loggingsentry:quarkus-logging-sentry") + implementation(libs.quarkus.logging.sentry) implementation("io.smallrye:smallrye-open-api-jaxrs") implementation("io.micrometer:micrometer-registry-prometheus") implementation("org.projectnessie.cel:cel-tools") @@ -80,8 +78,7 @@ dependencies { openapiSource(project(":nessie-model", "openapiSource")) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-client")) testImplementation(project(":nessie-jaxrs-tests")) @@ -93,8 +90,8 @@ dependencies { testImplementation("io.quarkus:quarkus-test-oidc-server") testImplementation("io.quarkus:quarkus-jacoco") - testImplementation("org.assertj:assertj-core") - testImplementation("org.mockito:mockito-core") + testImplementation(libs.assertj.core) + testImplementation(libs.mockito.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servers/quarkus-tests/build.gradle.kts b/servers/quarkus-tests/build.gradle.kts index 6fbcacbd005..4a5430798fe 100644 --- a/servers/quarkus-tests/build.gradle.kts +++ b/servers/quarkus-tests/build.gradle.kts @@ -25,11 +25,9 @@ extra["maven.name"] = "Nessie - Quarkus Tests" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform(project(":nessie-deps-quarkus"))) - implementation(enforcedPlatform("io.quarkus:quarkus-bom")) - implementation(platform("software.amazon.awssdk:bom")) - implementation(platform("io.quarkus.platform:quarkus-amazon-services-bom")) + implementation(enforcedPlatform(libs.quarkus.bom)) + implementation(platform(libs.awssdk.bom)) + implementation(platform(libs.quarkus.amazon.services.bom)) implementation(project(":nessie-quarkus-common")) implementation(project(":nessie-versioned-tests")) implementation(project(":nessie-versioned-persist-adapter")) @@ -41,10 +39,10 @@ dependencies { implementation(project(":nessie-versioned-persist-transactional")) implementation(project(":nessie-versioned-persist-transactional-test")) implementation("io.quarkus:quarkus-junit5") - implementation("org.testcontainers:testcontainers") - implementation("org.testcontainers:postgresql") - implementation("org.testcontainers:mongodb") - implementation("com.github.docker-java:docker-java-api") + implementation(libs.testcontainers.testcontainers) + implementation(libs.testcontainers.postgresql) + implementation(libs.testcontainers.mongodb) + implementation(libs.docker.java.api) implementation("software.amazon.awssdk:dynamodb") { exclude("software.amazon.awssdk", "apache-client") } diff --git a/servers/rest-services/build.gradle.kts b/servers/rest-services/build.gradle.kts index 38d66331f03..b020157a948 100644 --- a/servers/rest-services/build.gradle.kts +++ b/servers/rest-services/build.gradle.kts @@ -26,30 +26,29 @@ extra["maven.name"] = "Nessie - REST Services" dependencies { implementation(platform(rootProject)) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-services")) implementation(project(":nessie-versioned-spi")) - implementation("org.slf4j:slf4j-api") - implementation("jakarta.enterprise:jakarta.enterprise.cdi-api") - implementation("jakarta.annotation:jakarta.annotation-api") - implementation("jakarta.validation:jakarta.validation-api") - implementation("org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec") - implementation("javax.servlet:javax.servlet-api") - implementation("com.google.guava:guava") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + implementation(libs.slf4j.api) + implementation(libs.jakarta.enterprise.cdi.api) + implementation(libs.jakarta.annotation.api) + implementation(libs.jakarta.validation.api) + implementation(libs.javax.ws.rs21) + implementation(libs.javax.servlet) + implementation(libs.guava) + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) implementation("com.fasterxml.jackson.core:jackson-databind") compileOnly("com.fasterxml.jackson.core:jackson-annotations") - testImplementation(platform("org.junit:junit-bom")) - testImplementation(platform(project(":nessie-deps-testing"))) + testImplementation(platform(libs.junit.bom)) - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servers/services/build.gradle.kts b/servers/services/build.gradle.kts index 0cc91716bb6..9cd02ff3dcc 100644 --- a/servers/services/build.gradle.kts +++ b/servers/services/build.gradle.kts @@ -26,35 +26,32 @@ extra["maven.name"] = "Nessie - Services" dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(platform("org.projectnessie.cel:cel-bom")) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.cel.bom)) + compileOnly(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-versioned-spi")) - implementation("org.slf4j:slf4j-api") + implementation(libs.slf4j.api) implementation("org.projectnessie.cel:cel-tools") implementation("org.projectnessie.cel:cel-jackson") - compileOnly("org.immutables:builder") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - implementation("com.google.guava:guava") - implementation("com.google.code.findbugs:jsr305") + compileOnly(libs.immutables.builder) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.guava) + implementation(libs.findbugs.jsr305) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) - testCompileOnly(platform("com.fasterxml.jackson:jackson-bom")) + testImplementation(platform(libs.junit.bom)) + testCompileOnly(platform(libs.jackson.bom)) - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servers/store-proto/build.gradle.kts b/servers/store-proto/build.gradle.kts index 8b1863a293d..f31c0d0187f 100644 --- a/servers/store-proto/build.gradle.kts +++ b/servers/store-proto/build.gradle.kts @@ -29,7 +29,7 @@ extra["maven.name"] = "Nessie - Server - Store (Proto)" dependencies { api(platform(rootProject)) - api("com.google.protobuf:protobuf-java") + api(libs.protobuf.java) } // *.proto files taken from https://github.com/googleapis/googleapis/ repo, available as a git @@ -38,7 +38,7 @@ protobuf { // Configure the protoc executable protobuf.protoc { // Download from repositories - artifact = "com.google.protobuf:protoc:${dependencyVersion("versionProtobuf")}" + artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}" } } diff --git a/servers/store/build.gradle.kts b/servers/store/build.gradle.kts index 3ed2d222b33..e3dbf89a079 100644 --- a/servers/store/build.gradle.kts +++ b/servers/store/build.gradle.kts @@ -30,24 +30,23 @@ dependencies { implementation(project(":nessie-model")) implementation(project(":nessie-versioned-spi")) api(project(":nessie-server-store-proto")) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jackson.bom)) implementation("com.fasterxml.jackson.core:jackson-databind") - implementation("com.google.guava:guava") + implementation(libs.guava) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) - testCompileOnly(platform("com.fasterxml.jackson:jackson-bom")) + testImplementation(platform(libs.junit.bom)) + testCompileOnly(platform(libs.jackson.bom)) - testImplementation("com.google.guava:guava") - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testImplementation(libs.guava) + testCompileOnly(libs.microprofile.openapi) testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/tools/content-generator/build.gradle.kts b/tools/content-generator/build.gradle.kts index 59bb5c56891..82f4d026d68 100644 --- a/tools/content-generator/build.gradle.kts +++ b/tools/content-generator/build.gradle.kts @@ -21,36 +21,34 @@ plugins { jacoco `maven-publish` signing - id("com.github.johnrengelman.shadow") - id("org.projectnessie") + alias(libs.plugins.nessie.run) `nessie-conventions` } +applyShadowJar() + dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jackson.bom)) implementation(project(":nessie-client")) - implementation("jakarta.validation:jakarta.validation-api") - implementation("info.picocli:picocli") + implementation(libs.jakarta.validation.api) + implementation(libs.picocli) // TODO help picocli to make their annotation-processor incremental - annotationProcessor("info.picocli:picocli-codegen") - implementation("com.google.guava:guava") - compileOnly("com.google.code.findbugs:jsr305") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + annotationProcessor(libs.picocli.codegen) + implementation(libs.guava) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.microprofile.openapi) implementation("com.fasterxml.jackson.core:jackson-annotations") implementation("com.fasterxml.jackson.core:jackson-databind") - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 9cca15aae4d..3b48c4483a8 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -28,7 +28,7 @@ plugins { `java-library` `maven-publish` signing - id("com.github.node-gradle.node") + alias(libs.plugins.node.gradle) `nessie-conventions` } diff --git a/versioned/persist/adapter/build.gradle.kts b/versioned/persist/adapter/build.gradle.kts index 1b1b66614d6..6cc05ca5359 100644 --- a/versioned/persist/adapter/build.gradle.kts +++ b/versioned/persist/adapter/build.gradle.kts @@ -26,31 +26,27 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Adapter" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(project(":nessie-model")) implementation(project(":nessie-versioned-spi")) - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("org.immutables:value-annotations") - compileOnly("org.immutables:value-fixture") - annotationProcessor("org.immutables:value-processor") - implementation("com.google.protobuf:protobuf-java") - implementation("com.google.code.findbugs:jsr305") - implementation("com.google.guava:guava") - implementation("org.slf4j:slf4j-api") - implementation("org.agrona:agrona") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.immutables.value.annotations) + compileOnly(libs.immutables.value.fixture) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.protobuf.java) + implementation(libs.findbugs.jsr305) + implementation(libs.guava) + implementation(libs.slf4j.api) + implementation(libs.agrona) - implementation("io.opentracing:opentracing-api:${dependencyVersion("versionOpentracing")}") - implementation("io.opentracing:opentracing-util:${dependencyVersion("versionOpentracing")}") - implementation("io.micrometer:micrometer-core:${dependencyVersion("versionMicrometer")}") + implementation(libs.opentracing.api) + implementation(libs.opentracing.util) + implementation(libs.micrometer.core) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) - testImplementation("org.assertj:assertj-core") - testImplementation("org.mockito:mockito-core") + testImplementation(libs.assertj.core) + testImplementation(libs.mockito.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/persist/bench/build.gradle.kts b/versioned/persist/bench/build.gradle.kts index d5dd20c8687..9eb53efebe6 100644 --- a/versioned/persist/bench/build.gradle.kts +++ b/versioned/persist/bench/build.gradle.kts @@ -20,26 +20,24 @@ plugins { `java-library` `maven-publish` signing - id("com.github.johnrengelman.shadow") `nessie-conventions` } +applyShadowJar() + dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - implementation(platform(project(":nessie-deps-testing"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + compileOnly(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-versioned-tests")) implementation(project(":nessie-versioned-spi")) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-store")) - implementation("org.openjdk.jmh:jmh-core") - annotationProcessor("org.openjdk.jmh:jmh-generator-annprocess") + implementation(libs.jmh.core) + annotationProcessor(libs.jmh.generator.annprocess) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + compileOnly(libs.microprofile.openapi) implementation(project(":nessie-versioned-persist-in-memory")) implementation(project(":nessie-versioned-persist-in-memory-test")) @@ -52,13 +50,12 @@ dependencies { implementation(project(":nessie-versioned-persist-transactional")) implementation(project(":nessie-versioned-persist-transactional-test")) implementation(project(":nessie-versioned-persist-testextension")) - implementation("io.agroal:agroal-pool") - implementation("com.h2database:h2") - implementation("org.postgresql:postgresql") + implementation(libs.agroal.pool) + implementation(libs.h2) + implementation(libs.postgresql) } val shadowJar = tasks.named("shadowJar") { - outputs.cacheIf { false } // very big jar manifest { attributes["Main-Class"] = "org.openjdk.jmh.Main" } } diff --git a/versioned/persist/dynamodb-test/build.gradle.kts b/versioned/persist/dynamodb-test/build.gradle.kts index 1ba6eec0f05..c7573637f14 100644 --- a/versioned/persist/dynamodb-test/build.gradle.kts +++ b/versioned/persist/dynamodb-test/build.gradle.kts @@ -26,9 +26,8 @@ extra["maven.name"] = "Nessie - Versioned - Persist - DynamoDB/test-support" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("org.junit:junit-bom")) - implementation(platform("software.amazon.awssdk:bom:${dependencyVersion("versionAwssdk")}")) + implementation(platform(libs.junit.bom)) + implementation(platform(libs.awssdk.bom)) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-non-transactional")) @@ -40,6 +39,6 @@ dependencies { exclude("software.amazon.awssdk", "apache-client") } - implementation("org.testcontainers:testcontainers") - implementation("com.github.docker-java:docker-java-api") + implementation(libs.testcontainers.testcontainers) + implementation(libs.docker.java.api) } diff --git a/versioned/persist/dynamodb/build.gradle.kts b/versioned/persist/dynamodb/build.gradle.kts index e773a5d0ac9..2d8c47bf959 100644 --- a/versioned/persist/dynamodb/build.gradle.kts +++ b/versioned/persist/dynamodb/build.gradle.kts @@ -26,26 +26,23 @@ extra["maven.name"] = "Nessie - Versioned - Persist - DynamoDB" dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(platform("software.amazon.awssdk:bom:${dependencyVersion("versionAwssdk")}")) + implementation(platform(libs.awssdk.bom)) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-non-transactional")) implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-spi")) - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - implementation("com.google.code.findbugs:jsr305") - implementation("com.google.guava:guava") + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.findbugs.jsr305) + implementation(libs.guava) implementation("software.amazon.awssdk:dynamodb") { exclude("software.amazon.awssdk", "apache-client") } implementation("software.amazon.awssdk:netty-nio-client") implementation("software.amazon.awssdk:url-connection-client") - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-versioned-tests")) testImplementation(project(":nessie-versioned-persist-testextension")) @@ -53,7 +50,7 @@ dependencies { testImplementation(project(":nessie-versioned-persist-non-transactional-test")) testImplementation(project(":nessie-versioned-persist-dynamodb-test")) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/persist/inmem/build.gradle.kts b/versioned/persist/inmem/build.gradle.kts index 6db385c8551..57888a6b5be 100644 --- a/versioned/persist/inmem/build.gradle.kts +++ b/versioned/persist/inmem/build.gradle.kts @@ -26,20 +26,17 @@ extra["maven.name"] = "Nessie - Versioned - Persist - In-Memory" dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-non-transactional")) implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-spi")) - implementation("com.google.guava:guava") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - implementation("com.google.code.findbugs:jsr305") + implementation(libs.guava) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.findbugs.jsr305) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-versioned-tests")) testImplementation(project(":nessie-versioned-persist-testextension")) @@ -47,7 +44,7 @@ dependencies { testImplementation(project(":nessie-versioned-persist-non-transactional-test")) testImplementation(project(":nessie-versioned-persist-in-memory-test")) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/persist/mongodb-test/build.gradle.kts b/versioned/persist/mongodb-test/build.gradle.kts index 6ceef06b99d..06e884acf85 100644 --- a/versioned/persist/mongodb-test/build.gradle.kts +++ b/versioned/persist/mongodb-test/build.gradle.kts @@ -26,14 +26,13 @@ extra["maven.name"] = "Nessie - Versioned - Persist - MongoDB/test-support" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("org.junit:junit-bom")) + implementation(platform(libs.junit.bom)) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-non-transactional")) implementation(project(":nessie-versioned-persist-mongodb")) implementation(project(":nessie-versioned-persist-testextension")) implementation(project(":nessie-versioned-persist-non-transactional-test")) - implementation("org.testcontainers:mongodb") + implementation(libs.testcontainers.mongodb) implementation("org.junit.jupiter:junit-jupiter-api") } diff --git a/versioned/persist/mongodb/build.gradle.kts b/versioned/persist/mongodb/build.gradle.kts index 79e38c8899d..892ee3d7d47 100644 --- a/versioned/persist/mongodb/build.gradle.kts +++ b/versioned/persist/mongodb/build.gradle.kts @@ -26,22 +26,18 @@ extra["maven.name"] = "Nessie - Versioned - Persist - MongoDB" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-non-transactional")) implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-spi")) - implementation("com.google.guava:guava") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - implementation("com.google.code.findbugs:jsr305") - implementation("org.mongodb:mongodb-driver-sync") + implementation(libs.guava) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.findbugs.jsr305) + implementation(libs.mongodb.driver.sync) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-versioned-tests")) testImplementation(project(":nessie-versioned-persist-testextension")) @@ -49,7 +45,7 @@ dependencies { testImplementation(project(":nessie-versioned-persist-non-transactional-test")) testImplementation(project(":nessie-versioned-persist-mongodb-test")) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/persist/nontx-test/build.gradle.kts b/versioned/persist/nontx-test/build.gradle.kts index d6c1da05c91..ae6e34a4a3a 100644 --- a/versioned/persist/nontx-test/build.gradle.kts +++ b/versioned/persist/nontx-test/build.gradle.kts @@ -26,17 +26,16 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Non-Transactional/tests" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("org.junit:junit-bom")) + implementation(platform(libs.junit.bom)) implementation(project(":nessie-versioned-spi")) implementation(project(":nessie-versioned-persist-non-transactional")) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-persist-tests")) - implementation("com.google.guava:guava") + implementation(libs.guava) - implementation("org.assertj:assertj-core") + implementation(libs.assertj.core) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") } diff --git a/versioned/persist/nontx/build.gradle.kts b/versioned/persist/nontx/build.gradle.kts index f9f4bb02a89..17bb8f44cdd 100644 --- a/versioned/persist/nontx/build.gradle.kts +++ b/versioned/persist/nontx/build.gradle.kts @@ -26,23 +26,20 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Non-Transactional" dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-spi")) - implementation("com.google.guava:guava") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + implementation(libs.guava) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-versioned-persist-testextension")) testImplementation(project(":nessie-versioned-persist-tests")) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/persist/rocks/build.gradle.kts b/versioned/persist/rocks/build.gradle.kts index 88600c9468a..66f47ac4055 100644 --- a/versioned/persist/rocks/build.gradle.kts +++ b/versioned/persist/rocks/build.gradle.kts @@ -26,23 +26,19 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Rocks" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-non-transactional")) implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-spi")) - implementation("com.google.guava:guava") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - implementation("com.google.code.findbugs:jsr305") - implementation("org.rocksdb:rocksdbjni") - compileOnly("org.graalvm.nativeimage:svm") + implementation(libs.guava) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.findbugs.jsr305) + implementation(libs.rocksdb.jni) + compileOnly(libs.graalvm.nativeimage.svm) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-versioned-tests")) testImplementation(project(":nessie-versioned-persist-testextension")) @@ -50,7 +46,7 @@ dependencies { testImplementation(project(":nessie-versioned-persist-non-transactional-test")) testImplementation(project(":nessie-versioned-persist-rocks-test")) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/persist/serialize-proto/build.gradle.kts b/versioned/persist/serialize-proto/build.gradle.kts index e8b50c08157..2645d06864f 100644 --- a/versioned/persist/serialize-proto/build.gradle.kts +++ b/versioned/persist/serialize-proto/build.gradle.kts @@ -29,7 +29,7 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Serialization (Proto)" dependencies { api(platform(rootProject)) - api("com.google.protobuf:protobuf-java") + api(libs.protobuf.java) } // *.proto files taken from https://github.com/googleapis/googleapis/ repo, available as a git @@ -38,7 +38,7 @@ protobuf { // Configure the protoc executable protobuf.protoc { // Download from repositories - artifact = "com.google.protobuf:protoc:${dependencyVersion("versionProtobuf")}" + artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}" } } diff --git a/versioned/persist/serialize/build.gradle.kts b/versioned/persist/serialize/build.gradle.kts index 4b9b0daa0e9..6cf01d143ab 100644 --- a/versioned/persist/serialize/build.gradle.kts +++ b/versioned/persist/serialize/build.gradle.kts @@ -30,13 +30,12 @@ dependencies { implementation(project(":nessie-versioned-spi")) implementation(project(":nessie-versioned-persist-adapter")) api(project(":nessie-versioned-persist-serialize-proto")) - implementation("com.google.guava:guava") + implementation(libs.guava) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) - testImplementation("org.assertj:assertj-core") - testImplementation("org.mockito:mockito-core") + testImplementation(libs.assertj.core) + testImplementation(libs.mockito.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/persist/store/build.gradle.kts b/versioned/persist/store/build.gradle.kts index 2ffd1f395a8..ee869193c26 100644 --- a/versioned/persist/store/build.gradle.kts +++ b/versioned/persist/store/build.gradle.kts @@ -26,15 +26,15 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Version Store" dependencies { implementation(platform(rootProject)) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + compileOnly(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-spi")) - implementation("com.google.protobuf:protobuf-java") - implementation("com.google.code.findbugs:jsr305") - implementation("com.google.guava:guava") + implementation(libs.protobuf.java) + implementation(libs.findbugs.jsr305) + implementation(libs.guava) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) } diff --git a/versioned/persist/testextension/build.gradle.kts b/versioned/persist/testextension/build.gradle.kts index 541d53a938a..ae9563ef936 100644 --- a/versioned/persist/testextension/build.gradle.kts +++ b/versioned/persist/testextension/build.gradle.kts @@ -25,15 +25,14 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Testextension" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("org.junit:junit-bom")) + implementation(platform(libs.junit.bom)) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-store")) compileOnly(project(":nessie-versioned-tests")) implementation(project(":nessie-versioned-spi")) - implementation("io.micrometer:micrometer-core:${dependencyVersion("versionMicrometer")}") - implementation("io.opentracing:opentracing-mock:${dependencyVersion("versionOpentracing")}") + implementation(libs.micrometer.core) + implementation(libs.opentracing.mock) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") diff --git a/versioned/persist/tests/build.gradle.kts b/versioned/persist/tests/build.gradle.kts index 1ff84614982..e6a2c6b8dac 100644 --- a/versioned/persist/tests/build.gradle.kts +++ b/versioned/persist/tests/build.gradle.kts @@ -25,9 +25,8 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Tests" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-testing"))) - implementation(platform("org.junit:junit-bom")) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.junit.bom)) + compileOnly(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-versioned-persist-adapter")) @@ -35,16 +34,16 @@ dependencies { implementation(project(":nessie-versioned-persist-testextension")) implementation(project(":nessie-versioned-spi")) implementation(project(":nessie-versioned-tests")) - implementation("com.google.guava:guava") - implementation("io.micrometer:micrometer-core:${dependencyVersion("versionMicrometer")}") - implementation("io.opentracing:opentracing-mock:${dependencyVersion("versionOpentracing")}") - implementation("com.google.protobuf:protobuf-java") + implementation(libs.guava) + implementation(libs.micrometer.core) + implementation(libs.opentracing.mock) + implementation(libs.protobuf.java) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + compileOnly(libs.microprofile.openapi) - implementation("org.assertj:assertj-core") - implementation("org.mockito:mockito-core") + implementation(libs.assertj.core) + implementation(libs.mockito.core) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") } diff --git a/versioned/persist/tx-test/build.gradle.kts b/versioned/persist/tx-test/build.gradle.kts index 0b07919e16b..ea879e91349 100644 --- a/versioned/persist/tx-test/build.gradle.kts +++ b/versioned/persist/tx-test/build.gradle.kts @@ -26,10 +26,6 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Transactional/test-support dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(platform(project(":nessie-deps-testing"))) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-transactional")) @@ -37,17 +33,17 @@ dependencies { implementation(project(":nessie-versioned-spi")) implementation(project(":nessie-versioned-tests")) - implementation("com.google.guava:guava") - implementation("com.google.code.findbugs:jsr305") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - implementation("org.slf4j:slf4j-api") + implementation(libs.guava) + implementation(libs.findbugs.jsr305) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.slf4j.api) - implementation("io.agroal:agroal-pool") - compileOnly("com.h2database:h2") - compileOnly("org.postgresql:postgresql") + implementation(libs.agroal.pool) + compileOnly(libs.h2) + compileOnly(libs.postgresql) - implementation("org.testcontainers:postgresql") - implementation("org.testcontainers:cockroachdb") - implementation("com.github.docker-java:docker-java-api") + implementation(libs.testcontainers.postgresql) + implementation(libs.testcontainers.cockroachdb) + implementation(libs.docker.java.api) } diff --git a/versioned/persist/tx/build.gradle.kts b/versioned/persist/tx/build.gradle.kts index ed87b3a12e0..ab2acbee5b9 100644 --- a/versioned/persist/tx/build.gradle.kts +++ b/versioned/persist/tx/build.gradle.kts @@ -26,38 +26,32 @@ extra["maven.name"] = "Nessie - Versioned - Persist - Transactional" dependencies { implementation(platform(rootProject)) - implementation(platform(project(":nessie-deps-persist"))) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-spi")) - implementation("com.google.guava:guava") - implementation("com.google.code.findbugs:jsr305") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") - implementation("org.slf4j:slf4j-api") + implementation(libs.guava) + implementation(libs.findbugs.jsr305) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) + implementation(libs.slf4j.api) - compileOnly("io.agroal:agroal-pool") - compileOnly("com.h2database:h2") - compileOnly("org.postgresql:postgresql") + compileOnly(libs.agroal.pool) + compileOnly(libs.h2) + compileOnly(libs.postgresql) - testCompileOnly(platform(project(":nessie-deps-build-only"))) - testAnnotationProcessor(platform(project(":nessie-deps-build-only"))) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-versioned-tests")) - testCompileOnly("org.immutables:value-annotations") - testAnnotationProcessor("org.immutables:value-processor") + testCompileOnly(libs.immutables.value.annotations) + testAnnotationProcessor(libs.immutables.value.processor) testImplementation(project(":nessie-versioned-persist-testextension")) testImplementation(project(":nessie-versioned-persist-tests")) testImplementation(project(":nessie-versioned-persist-transactional-test")) - testRuntimeOnly("com.h2database:h2") - testRuntimeOnly("org.postgresql:postgresql") + testRuntimeOnly(libs.h2) + testRuntimeOnly(libs.postgresql) - testImplementation("org.assertj:assertj-core") + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/versioned/spi/build.gradle.kts b/versioned/spi/build.gradle.kts index e1e4a7d1301..8c5ca20e750 100644 --- a/versioned/spi/build.gradle.kts +++ b/versioned/spi/build.gradle.kts @@ -26,39 +26,36 @@ extra["maven.name"] = "Nessie - Versioned Store SPI" dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jackson.bom)) implementation(project(":nessie-model")) - implementation("com.google.protobuf:protobuf-java") + implementation(libs.protobuf.java) implementation("com.fasterxml.jackson.core:jackson-databind") - compileOnly("org.immutables:builder") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + compileOnly(libs.immutables.builder) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") - implementation("com.google.guava:guava") - implementation("com.google.code.findbugs:jsr305") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) + implementation(libs.guava) + implementation(libs.findbugs.jsr305) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) - testCompileOnly(platform("com.fasterxml.jackson:jackson-bom")) + testImplementation(platform(libs.junit.bom)) + testCompileOnly(platform(libs.jackson.bom)) - testImplementation("org.assertj:assertj-core") - testImplementation("org.mockito:mockito-core") + testImplementation(libs.assertj.core) + testImplementation(libs.mockito.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testCompileOnly("com.fasterxml.jackson.core:jackson-annotations") - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") + testCompileOnly(libs.microprofile.openapi) // Need a few things from Quarkus, but don't leak the dependencies - compileOnly("io.opentracing:opentracing-api:${dependencyVersion("versionOpentracing")}") - compileOnly("io.opentracing:opentracing-util:${dependencyVersion("versionOpentracing")}") - compileOnly("io.micrometer:micrometer-core:${dependencyVersion("versionMicrometer")}") - testImplementation("io.opentracing:opentracing-api:${dependencyVersion("versionOpentracing")}") - testImplementation("io.opentracing:opentracing-util:${dependencyVersion("versionOpentracing")}") - testImplementation("io.micrometer:micrometer-core:${dependencyVersion("versionMicrometer")}") + compileOnly(libs.opentracing.api) + compileOnly(libs.opentracing.util) + compileOnly(libs.micrometer.core) + testImplementation(libs.opentracing.api) + testImplementation(libs.opentracing.util) + testImplementation(libs.micrometer.core) } diff --git a/versioned/tests/build.gradle.kts b/versioned/tests/build.gradle.kts index c2cc95f13bf..9176066c62d 100644 --- a/versioned/tests/build.gradle.kts +++ b/versioned/tests/build.gradle.kts @@ -25,24 +25,21 @@ extra["maven.name"] = "Nessie - Versioned Store Integration Tests" dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(platform(project(":nessie-deps-testing"))) - compileOnly(platform("com.fasterxml.jackson:jackson-bom")) + compileOnly(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-versioned-spi")) - implementation("com.google.guava:guava") - implementation("org.slf4j:slf4j-api") - implementation("com.google.protobuf:protobuf-java") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + implementation(libs.guava) + implementation(libs.slf4j.api) + implementation(libs.protobuf.java) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) compileOnly("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) - implementation("org.assertj:assertj-core") - implementation(platform("org.junit:junit-bom")) + implementation(libs.assertj.core) + implementation(platform(libs.junit.bom)) implementation("org.junit.jupiter:junit-jupiter-api") implementation("org.junit.jupiter:junit-jupiter-params") } diff --git a/versioned/transfer-proto/build.gradle.kts b/versioned/transfer-proto/build.gradle.kts index 5840159c737..6962e0769b9 100644 --- a/versioned/transfer-proto/build.gradle.kts +++ b/versioned/transfer-proto/build.gradle.kts @@ -29,14 +29,14 @@ extra["maven.name"] = "Nessie - Export/Import - Serialization (Proto)" dependencies { implementation(platform(rootProject)) - implementation("com.google.protobuf:protobuf-java") + implementation(libs.protobuf.java) } protobuf { // Configure the protoc executable protobuf.protoc { // Download from repositories - artifact = "com.google.protobuf:protoc:${dependencyVersion("versionProtobuf")}" + artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}" } } diff --git a/versioned/transfer/build.gradle.kts b/versioned/transfer/build.gradle.kts index d30385499ab..16b576c4933 100644 --- a/versioned/transfer/build.gradle.kts +++ b/versioned/transfer/build.gradle.kts @@ -26,32 +26,28 @@ extra["maven.name"] = "Nessie - Import/Export" dependencies { implementation(platform(rootProject)) - compileOnly(platform(project(":nessie-deps-build-only"))) - annotationProcessor(platform(project(":nessie-deps-build-only"))) - implementation(platform(project(":nessie-deps-persist"))) - implementation(platform("com.fasterxml.jackson:jackson-bom")) + implementation(platform(libs.jackson.bom)) implementation(project(":nessie-model")) implementation(project(":nessie-versioned-spi")) implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-transfer-proto")) - implementation("com.google.protobuf:protobuf-java") + implementation(libs.protobuf.java) implementation("com.fasterxml.jackson.core:jackson-databind") implementation("com.fasterxml.jackson.core:jackson-annotations") - compileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - compileOnly("jakarta.validation:jakarta.validation-api") - implementation("com.google.code.findbugs:jsr305") - compileOnly("com.google.errorprone:error_prone_annotations") - implementation("com.google.guava:guava") + compileOnly(libs.microprofile.openapi) + compileOnly(libs.jakarta.validation.api) + implementation(libs.findbugs.jsr305) + compileOnly(libs.errorprone.annotations) + implementation(libs.guava) - compileOnly("org.immutables:builder") - compileOnly("org.immutables:value-annotations") - annotationProcessor("org.immutables:value-processor") + compileOnly(libs.immutables.builder) + compileOnly(libs.immutables.value.annotations) + annotationProcessor(libs.immutables.value.processor) - testImplementation(platform(project(":nessie-deps-testing"))) - testImplementation(platform("org.junit:junit-bom")) + testImplementation(platform(libs.junit.bom)) testImplementation(project(":nessie-client")) @@ -68,11 +64,11 @@ dependencies { testImplementation(project(":nessie-versioned-persist-transactional")) testImplementation(project(":nessie-versioned-persist-transactional-test")) - testRuntimeOnly("com.h2database:h2") + testRuntimeOnly(libs.h2) - testCompileOnly("org.eclipse.microprofile.openapi:microprofile-openapi-api") - testImplementation("org.mockito:mockito-core") - testImplementation("org.assertj:assertj-core") + testCompileOnly(libs.microprofile.openapi) + testImplementation(libs.mockito.core) + testImplementation(libs.assertj.core) testImplementation("org.junit.jupiter:junit-jupiter-api") testImplementation("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")