From d23a31784d3a1b364c08d51cb9ae85084b9d3a64 Mon Sep 17 00:00:00 2001 From: Matt Wright Date: Fri, 8 Mar 2024 11:55:30 -0500 Subject: [PATCH] Upgrade dependencies --- acme-data/acme-data-sql/build.gradle.kts | 2 +- gradle/libs.versions.toml | 70 +++++++++++------------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/acme-data/acme-data-sql/build.gradle.kts b/acme-data/acme-data-sql/build.gradle.kts index ae2f970..ce81455 100644 --- a/acme-data/acme-data-sql/build.gradle.kts +++ b/acme-data/acme-data-sql/build.gradle.kts @@ -38,7 +38,7 @@ java { } jooq { - version.set("3.18.7") + version.set(libs.versions.org.jooq) edition.set(JooqEdition.OSS) configurations { create("main") { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7fe0a60..8be1bf5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,29 +1,27 @@ [versions] -com-appmattus-fixture = "1.2.0" io-jaegertracing = "1.8.1" io-kotest = "5.8.0" -io-ktor = "2.3.4" -io-opentelemetry = "1.30.1" -kotlin = "1.9.21" -org-jooq = "3.18.7" -org-junit-jupiter = "5.10.0" -org-seleniumhq-selenium = "4.13.0" -org-slf4j = "2.0.9" +io-ktor = "2.3.9" +io-opentelemetry = "1.36.0" +kotlin = "1.9.23" +org-jooq = "3.19.6" +org-junit-jupiter = "5.10.2" +org-seleniumhq-selenium = "4.18.1" +org-slf4j = "2.0.12" +org-testcontainers = "1.19.7" [libraries] am-ik-timeflake-timeflake4j = "am.ik.timeflake:timeflake4j:1.4.0" -ch-qos-logback-logback-classic = "ch.qos.logback:logback-classic:1.4.14" -com-appmattus-fixture = { module = "com.appmattus.fixture:fixture", version.ref = "com-appmattus-fixture" } -com-appmattus-fixture-fixture-javafaker = { module = "com.appmattus.fixture:fixture-javafaker", version.ref = "com-appmattus-fixture" } -# @keep this version, it's used in buildSrc and the update plugin doens't recognize it +ch-qos-logback-logback-classic = "ch.qos.logback:logback-classic:1.5.3" +# @keep this version, it's used in buildSrc and the update plugin doesn't recognize it com-diffplug-spotless-gradle-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.6.1" com-github-java-json-tools-json-schema-validator = "com.github.java-json-tools:json-schema-validator:2.2.14" -com-googlecode-libphonenumber = "com.googlecode.libphonenumber:libphonenumber:8.13.27" +com-googlecode-libphonenumber = "com.googlecode.libphonenumber:libphonenumber:8.13.32" com-mattbertolini-liquibase-slf4j = "com.mattbertolini:liquibase-slf4j:5.0.0" com-michael-bull-kotlin-coroutines-jdbc = "com.michael-bull.kotlin-coroutines-jdbc:kotlin-coroutines-jdbc:1.0.2" com-zaxxer-HikariCP = "com.zaxxer:HikariCP:5.1.0" io-github-bonigarcia-selenium-jupiter = "io.github.bonigarcia:selenium-jupiter:4.3.7" -io-github-oshai-kotlin-logging-jvm = "io.github.oshai:kotlin-logging-jvm:5.1.0" +io-github-oshai-kotlin-logging-jvm = "io.github.oshai:kotlin-logging-jvm:6.0.3" io-jaegertracing-jaeger-micrometer = { module = "io.jaegertracing:jaeger-micrometer", version.ref = "io-jaegertracing" } io-jaegertracing-jaeger-thrift = { module = "io.jaegertracing:jaeger-thrift", version.ref = "io-jaegertracing" } io-kotest-extensions-kotest-assertions-ktor = "io.kotest.extensions:kotest-assertions-ktor:2.0.0" @@ -51,8 +49,8 @@ io-ktor-ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref io-ktor-ktor-server-sessions = { module = "io.ktor:ktor-server-sessions", version.ref = "io-ktor" } io-ktor-ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages", version.ref = "io-ktor" } io-ktor-ktor-server-thymeleaf = { module = "io.ktor:ktor-server-thymeleaf", version.ref = "io-ktor" } -io-micrometer-micrometer-registry-prometheus = "io.micrometer:micrometer-registry-prometheus:1.11.4" -io-opentelemetry-javaagent-opentelemetry-javaagent = "io.opentelemetry.javaagent:opentelemetry-javaagent:1.30.0" +io-micrometer-micrometer-registry-prometheus = "io.micrometer:micrometer-registry-prometheus:1.12.3" +io-opentelemetry-javaagent-opentelemetry-javaagent = "io.opentelemetry.javaagent:opentelemetry-javaagent:2.1.0" io-opentelemetry-opentelemetry-api = { module = "io.opentelemetry:opentelemetry-api", version.ref = "io-opentelemetry" } io-opentelemetry-opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "io-opentelemetry" } io-opentelemetry-opentelemetry-sdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "io-opentelemetry" } @@ -60,18 +58,17 @@ io-opentracing-opentracing-api = "io.opentracing:opentracing-api:0.33.0" jakarta-validation-jakarta-validation-api = "jakarta.validation:jakarta.validation-api:3.0.2" net-logstash-logback-logstash-logback-encoder = "net.logstash.logback:logstash-logback-encoder:7.4" net-sizovs-pipelinr = "net.sizovs:pipelinr:0.8" -net-datafaker-datafaker = "net.datafaker:datafaker:2.0.2" -org-apache-logging-log4j-log4j-core = "org.apache.logging.log4j:log4j-core:2.17.1" +net-datafaker-datafaker = "net.datafaker:datafaker:2.1.0" org-glassfish-jakarta-el = "org.glassfish:jakarta.el:5.0.0-M1" org-hibernate-validator-hibernate-validator = "org.hibernate.validator:hibernate-validator:8.0.1.Final" org-jetbrains-annotations = "org.jetbrains:annotations:13.0" # @keep this version, it's used in buildSrc and the update plugin doesn't recognize it org-jetbrains-kotlin-jvm-gradle-plugin = { module = "org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin", version.ref = "kotlin" } -# @keep this version, it's used in buildSrc and the update plugin doens't recognize it +# @keep this version, it's used in buildSrc and the update plugin doesn't recognize it org-jetbrains-kotlin-serialization-gradle-plugin = { module = "org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin", version.ref = "kotlin" } -org-jetbrains-kotlinx-kotlinx-coroutines-core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3" -org-jetbrains-kotlinx-kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0" -# @keep this version, it's used in buildSrc and the update plugin doens't recognize it +org-jetbrains-kotlinx-kotlinx-coroutines-core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0" +org-jetbrains-kotlinx-kotlinx-serialization-json = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3" +# @keep this version, it's used in buildSrc and the update plugin doesn't recognize it org-jlleitschuh-ktlint-gradle-plugin = "org.jlleitschuh.gradle:ktlint-gradle:10.2.1" org-jooq = { module = "org.jooq:jooq", version.ref = "org-jooq" } org-jooq-jooq-codegen = { module = "org.jooq:jooq-codegen", version.ref = "org-jooq" } @@ -79,24 +76,23 @@ org-jooq-jooq-kotlin = { module = "org.jooq:jooq-kotlin", version.ref = "org-joo org-jooq-jooq-kotlin-coroutines = { module = "org.jooq:jooq-kotlin-coroutines", version.ref = "org-jooq" } org-junit-jupiter-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter" } org-junit-jupiter-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "org-junit-jupiter" } -org-junit-platform-junit-platform-launcher = "org.junit.platform:junit-platform-launcher:1.9.1" -org-liquibase-liquibase-core = "org.liquibase:liquibase-core:4.25.0" -org-postgresql = "org.postgresql:postgresql:42.7.1" -org-postgresql-r2dbc = "org.postgresql:r2dbc-postgresql:1.0.2.RELEASE" +org-junit-platform-junit-platform-launcher = "org.junit.platform:junit-platform-launcher:1.10.2" +org-liquibase-liquibase-core = "org.liquibase:liquibase-core:4.26.0" +org-postgresql = "org.postgresql:postgresql:42.7.2" +org-postgresql-r2dbc = "org.postgresql:r2dbc-postgresql:1.0.4.RELEASE" org-seleniumhq-selenium-selenium-chrome-driver = { module = "org.seleniumhq.selenium:selenium-chrome-driver", version.ref = "org-seleniumhq-selenium" } org-seleniumhq-selenium-selenium-java = { module = "org.seleniumhq.selenium:selenium-java", version.ref = "org-seleniumhq-selenium" } -org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org.slf4j" } -org-slf4j-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "org.slf4j" } -org-testcontainers-postgresql = "org.testcontainers:postgresql:1.19.3" -org-testcontainers-r2dbc = "org.testcontainers:r2dbc:1.19.3" -org-webjars-swagger-ui = "org.webjars:swagger-ui:5.10.3" -org-yaml-snakeyaml = "org.yaml:snakeyaml:2.2" -sh-ory-kratos = "sh.ory.kratos:kratos-client:1.0.0" +org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" } +org-slf4j-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "org-slf4j" } +org-testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "org-testcontainers" } +org-testcontainers-r2dbc = { module = "org.testcontainers:r2dbc", version.ref = "org-testcontainers" } +org-webjars-swagger-ui = "org.webjars:swagger-ui:5.11.8" +sh-ory-kratos = "sh.ory.kratos:kratos-client:1.1.0" [plugins] -com-github-ben-manes-versions = "com.github.ben-manes.versions:0.50.0" -com-google-cloud-tools-jib = "com.google.cloud.tools.jib:3.4.0" +com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0" +com-google-cloud-tools-jib = "com.google.cloud.tools.jib:3.4.1" com-ryandens-javaagent-jib = "com.ryandens.javaagent-jib:0.5.1" -nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.1" -nu-studer-jooq = "nu.studer.jooq:8.2.1" +nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.4" +nu-studer-jooq = "nu.studer.jooq:9.0" org-hidetake-swagger-generator = "org.hidetake.swagger.generator:2.19.2"