Build/nit: simplify version catalog usage (#7032)

projectnessie · Jun 13, 2023 · b147244 · b147244
1 parent 01b80cc
commit b147244
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -34,9 +34,9 @@ dependencies {
 
   testImplementation(platform(baselibs.junit.bom))
   testImplementation(baselibs.assertj.core)
-  testImplementation(baselibs.junit.jupiter.api)
-  testImplementation(baselibs.junit.jupiter.params)
-  testRuntimeOnly(baselibs.junit.jupiter.engine)
+  testImplementation("org.junit.jupiter:junit-jupiter-api")
+  testImplementation("org.junit.jupiter:junit-jupiter-params")
+  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 }
 
 java { toolchain { languageVersion.set(JavaLanguageVersion.of(11)) } }

diff --git a/gradle/baselibs.versions.toml b/gradle/baselibs.versions.toml
@@ -6,8 +6,5 @@ errorprone = { module = "net.ltgt.gradle:gradle-errorprone-plugin", version = "3
 idea-ext = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version = "1.1.7" }
 jandex = { module = "com.github.vlsi.gradle:jandex-plugin", version = "1.89" }
 junit-bom = { module = "org.junit:junit-bom", version = "5.9.3" }
-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params" }
 shadow = { module = "com.github.johnrengelman:shadow", version = "8.1.1" }
 spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.19.0" }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,6 @@
 
 [versions]
 antlr4 = "4.13.0"
-awssdk = "2.20.84"
 bouncycastle = "1.70"
 checkstyle = "10.12.0"
 errorprone = "2.19.1"
@@ -46,7 +45,7 @@ antlr-antlr4-runtime = { module = "org.antlr:antlr4-runtime", version.ref = "ant
 assertj-core = { module = "org.assertj:assertj-core", version = "3.24.2" }
 avro = { module = "org.apache.avro:avro", version = "1.11.1" }
 awaitility = { module = "org.awaitility:awaitility", version = "4.2.0" }
-awssdk-bom = { module = "software.amazon.awssdk:bom", version.ref = "awssdk" }
+awssdk-bom = { module = "software.amazon.awssdk:bom", version = "2.20.84" }
 bouncycastle-bcpkix = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bouncycastle" }
 bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk15on", version.ref = "bouncycastle" }
 cassandra-driver-bom = { module = "com.datastax.oss:java-driver-bom", version = "4.16.0" }