Merge

Author: wolpert

build.gradle.kts

@@ -4,6 +4,8 @@ allprojects {
     version = "3.0.4"
     //version = "3.0.3-SNAPSHOT"
 }
-
+plugins {
+    id("nl.littlerobots.version-catalog-update") version "1.0.0"
+}
 // gradle jreleaserConfig
 // gradle clean build test public jreleaserDeploy

buildSrc/build.gradle.kts

@@ -14,4 +14,5 @@ repositories {
 
 dependencies {
     implementation(libs.gradleplugin.jreleaser)
+    implementation("com.github.ben-manes:gradle-versions-plugin:0.52.0")
 }

buildSrc/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts

@@ -5,6 +5,7 @@
 plugins {
     // Apply the java Plugin to add support for Java.
     java
+    id("com.github.ben-manes.versions")
 }
 
 repositories {

gradle/libs.versions.toml

@@ -1,6 +1,5 @@
 # This file was generated by the Gradle 'init' task.
 # https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
-
 [versions]
 aspectj = "1.9.24"
 assertj = "3.27.4"
@@ -13,22 +12,23 @@ commons-codec = "1.19.0"
 commons-io = "2.20.0"
 dagger = "2.57.1"
 dropwizard4 = "4.0.16"
-jreleaser = '1.18.0'
-jdbi = '3.49.5'
-jsr305 = "3.0.2"
-immutables = '2.11.3'
-hsqldb = '2.7.4'
-jackson = '2.20'
+hsqldb = "2.7.4"
+immutables = "2.11.3"
+jackson = "2.20.0"
+jackson_annotations = "2.20"
+jdbi = "3.49.5"
 jetcd = "0.8.5"
+jreleaser = "1.20.0"
+jsr305 = "3.0.2"
 junit-jupiter = "5.13.4"
-liquibase = '4.33.0'
-logback = '1.5.18'
-micrometer = '1.15.3'
-metrics = '4.2.36'
-mokito = '5.19.0'
-pgjdbc = '42.7.7'
-slf4j = '2.0.17'
-testcontainers = '1.21.3'
+liquibase = "4.33.0"
+logback = "1.5.18"
+metrics = "4.2.36"
+micrometer = "1.15.3"
+mokito = "5.19.0"
+pgjdbc = "42.7.7"
+slf4j = "2.0.17"
+testcontainers = "1.21.3"
 
 [libraries]
 aspectjrt = { module = "org.aspectj:aspectjrt", version.ref = "aspectj" }
@@ -37,49 +37,69 @@ assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 aws-dynamodblocal = { module = "com.amazonaws:DynamoDBLocal", version.ref = "aws-dynamodblocal" }
 aws-sdk-ddb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version.ref = "awsSDK1" }
 aws-sdk2-bom = { module = "software.amazon.awssdk:bom", version.ref = "awsSDK2" }
-c3p0 =  { module = "com.mchange:c3p0", version.ref ="c3p0" }
+c3p0 = { module = "com.mchange:c3p0", version.ref = "c3p0" }
 caffine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffine" }
 caffine-jcache = { module = "com.github.ben-manes.caffeine:jcache", version.ref = "caffine" }
 commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" }
 commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
-dropwizard4-core= { module = "io.dropwizard:dropwizard-core", version.ref = "dropwizard4" }
+dropwizard4-core = { module = "io.dropwizard:dropwizard-core", version.ref = "dropwizard4" }
+gradleplugin-jreleaser = { module = "org.jreleaser:org.jreleaser.gradle.plugin", version.ref = "jreleaser" }
 hsqldb = { module = "org.hsqldb:hsqldb", version.ref = "hsqldb" }
-immutables-value = { module = "org.immutables:value", version.ref = "immutables" }
 immutables-annotations = { module = "org.immutables:value-annotations", version.ref = "immutables" }
-jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
+immutables-value = { module = "org.immutables:value", version.ref = "immutables" }
+jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson_annotations" }
 jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
 jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8", version.ref = "jackson" }
-javax-inject = { module = "javax.inject:javax.inject", version = "1" }
+javax-inject = "javax.inject:javax.inject:1"
+jdbi-caffeine = { module = "org.jdbi:jdbi3-caffeine-cache", version.ref = "jdbi" }
+jdbi-core = { module = "org.jdbi:jdbi3-core", version.ref = "jdbi" }
+jdbi-noopcache = { module = "org.jdbi:jdbi3-noop-cache", version.ref = "jdbi" }
+jdbi-postgres = { module = "org.jdbi:jdbi3-postgres", version.ref = "jdbi" }
+jdbi-sqlobject = { module = "org.jdbi:jdbi3-sqlobject", version.ref = "jdbi" }
+jdbi-testing = { module = "org.jdbi:jdbi3-testing", version.ref = "jdbi" }
 jetcd = { module = "io.etcd:jetcd-core", version.ref = "jetcd" }
 jetcd-test = { module = "io.etcd:jetcd-test", version.ref = "jetcd" }
-jdbi-core = {module = "org.jdbi:jdbi3-core", version.ref = "jdbi" }
-jdbi-caffeine = {module = "org.jdbi:jdbi3-caffeine-cache", version.ref = "jdbi" }
-jdbi-noopcache = {module = "org.jdbi:jdbi3-noop-cache", version.ref = "jdbi" }
-jdbi-postgres = {module = "org.jdbi:jdbi3-postgres", version.ref = "jdbi" }
-jdbi-sqlobject = {module = "org.jdbi:jdbi3-sqlobject", version.ref = "jdbi" }
-jdbi-testing = {module = "org.jdbi:jdbi3-testing", version.ref = "jdbi" }
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
 liquibase-core = { module = "org.liquibase:liquibase-core", version.ref = "liquibase" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 logback-core = { module = "ch.qos.logback:logback-core", version.ref = "logback" }
-pgjdbc = { module = "org.postgresql:postgresql", version.ref = "pgjdbc" }
 metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "metrics" }
 micrometer-core = { module = "io.micrometer:micrometer-core", version.ref = "micrometer" }
 mockito-core = { module = "org.mockito:mockito-core", version.ref = "mokito" }
 mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mokito" }
+pgjdbc = { module = "org.postgresql:postgresql", version.ref = "pgjdbc" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
 testcontainers-postgres = { module = "org.testcontainers:postgresql", version.ref = "testcontainers" }
-gradleplugin-jreleaser = { group = "org.jreleaser", name = "org.jreleaser.gradle.plugin", version.ref = "jreleaser" }
+
 [plugins]
 jreleaser = { id = "org.jreleaser", version.ref = "jreleaser" }
 
 [bundles]
-caffine = ["caffine", "caffine-jcache"]
-jackson = ['jackson-dataformat-yaml']
-logback = ['logback-classic', 'logback-core']
-testing = ["mockito-core", "mockito-junit-jupiter", "assertj", "junit-jupiter"]
-jdbi = ["jdbi-core", "jdbi-caffeine", "jdbi-noopcache",  "jdbi-postgres", "jdbi-sqlobject"]
+caffine = [
+    "caffine",
+    "caffine-jcache",
+]
+jackson = [
+    "jackson-dataformat-yaml",
+]
+jdbi = [
+    "jdbi-caffeine",
+    "jdbi-core",
+    "jdbi-noopcache",
+    "jdbi-postgres",
+    "jdbi-sqlobject",
+]
+logback = [
+    "logback-classic",
+    "logback-core",
+]
+testing = [
+    "assertj",
+    "junit-jupiter",
+    "mockito-core",
+    "mockito-junit-jupiter",
+]

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME