From 3f97269ac7d57243716632d145d3c1aa4fe08efb Mon Sep 17 00:00:00 2001 From: dzikoysk Date: Fri, 22 Nov 2024 15:53:56 +0100 Subject: [PATCH] GH-2280 Upgrade dependencies in reposilite-backend module --- build.gradle.kts | 6 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- reposilite-backend/build.gradle.kts | 35 ++++++++++++------- .../groovy-plugin/build.gradle.kts | 2 +- .../migration-plugin/build.gradle.kts | 4 +-- .../prometheus-plugin/build.gradle.kts | 2 +- 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 43b42550a..bdb72446b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ plugins { application `maven-publish` - val kotlinVersion = "2.0.20" + val kotlinVersion = "2.0.21" kotlin("jvm") version kotlinVersion kotlin("kapt") version kotlinVersion @@ -120,14 +120,14 @@ subprojects { apply(plugin = "maven-publish") dependencies { - val unirest = "4.4.4" + val unirest = "4.4.5" testImplementation("com.konghq:unirest-java-core:$unirest") testImplementation("com.konghq:unirest-modules-jackson:$unirest") val assertJ = "3.26.3" testImplementation("org.assertj:assertj-core:$assertJ") - val junit = "5.11.2" + val junit = "5.11.3" testImplementation("org.junit.jupiter:junit-jupiter-params:$junit") testImplementation("org.junit.jupiter:junit-jupiter-api:$junit") testImplementation("org.junit.jupiter:junit-jupiter-engine:$junit") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a0a0e28c..11581996b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/reposilite-backend/build.gradle.kts b/reposilite-backend/build.gradle.kts index 5f20859c6..81df72923 100644 --- a/reposilite-backend/build.gradle.kts +++ b/reposilite-backend/build.gradle.kts @@ -39,14 +39,21 @@ dependencies { // val detekt = "1.23.5" // detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detekt") - val kotlin = "2.0.20" + val kotlin = "2.0.21" implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin") val javalin = "6.3.0" - api("io.javalin:javalin:$javalin") + api("io.javalin:javalin:$javalin") { + exclude(group = "org.eclipse.jetty", module = "jetty-server") + exclude(group = "org.eclipse.jetty", module = "jetty-http") + } api("io.javalin.community.ssl:ssl-plugin:$javalin") + val jetty = "11.0.24" + implementation("org.eclipse.jetty:jetty-server:$jetty") + implementation("org.eclipse.jetty:jetty-http:$jetty") + val javalinOpenApi = "6.3.0" api("io.javalin.community.openapi:javalin-openapi-plugin:$javalinOpenApi") kapt("io.javalin.community.openapi:openapi-annotation-processor:$javalinOpenApi") @@ -70,38 +77,42 @@ dependencies { kapt("info.picocli:picocli-codegen:$picocli") api("info.picocli:picocli:$picocli") - val awssdk = "2.28.16" + val awssdk = "2.29.19" implementation(platform("software.amazon.awssdk:bom:$awssdk")) implementation("software.amazon.awssdk:s3:$awssdk") val awsSdkV1 = "1.12.773" testImplementation("com.amazonaws:aws-java-sdk-s3:$awsSdkV1") - val exposed = "0.55.0" + val exposed = "0.56.0" api("org.jetbrains.exposed:exposed-core:$exposed") api("org.jetbrains.exposed:exposed-dao:$exposed") api("org.jetbrains.exposed:exposed-jdbc:$exposed") api("org.jetbrains.exposed:exposed-java-time:$exposed") + // Drivers - implementation("com.zaxxer:HikariCP:6.0.0") - implementation("org.xerial:sqlite-jdbc:3.46.1.3") - implementation("mysql:mysql-connector-java:8.0.33") - implementation("org.mariadb.jdbc:mariadb-java-client:3.4.1") + implementation("com.zaxxer:HikariCP:6.2.1") + implementation("org.xerial:sqlite-jdbc:3.47.0.0") + implementation("org.mariadb.jdbc:mariadb-java-client:3.5.1") implementation("org.postgresql:postgresql:42.7.4") implementation("com.h2database:h2:2.3.232") + implementation("com.mysql:mysql-connector-j:9.1.0") { + exclude(group = "com.google.protobuf", module = "protobuf-java") + } + implementation("com.google.protobuf:protobuf-java:4.28.3") val exposedUpsert = "1.2.2" api("net.dzikoysk:exposed-upsert:$exposedUpsert") - val jackson = "2.18.0" + val jackson = "2.18.1" implementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jackson") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson") - val jsonSchema = "4.36.0" + val jsonSchema = "4.37.0" implementation("com.github.victools:jsonschema-generator:$jsonSchema") - val httpClient = "1.45.0" + val httpClient = "1.45.1" implementation("com.google.http-client:google-http-client:$httpClient") { exclude(group = "commons-codec", module = "commons-codec") } @@ -123,7 +134,7 @@ dependencies { implementation("org.tinylog:tinylog-api:$tinylog") implementation("org.tinylog:tinylog-impl:$tinylog") - val testcontainers = "1.20.2" + val testcontainers = "1.20.4" testImplementation("org.testcontainers:postgresql:$testcontainers") testImplementation("org.testcontainers:mariadb:$testcontainers") testImplementation("org.testcontainers:testcontainers:$testcontainers") diff --git a/reposilite-plugins/groovy-plugin/build.gradle.kts b/reposilite-plugins/groovy-plugin/build.gradle.kts index abbadbd3a..2e137242f 100644 --- a/reposilite-plugins/groovy-plugin/build.gradle.kts +++ b/reposilite-plugins/groovy-plugin/build.gradle.kts @@ -27,7 +27,7 @@ application { dependencies { compileOnly(project(":reposilite-backend")) - implementation("org.apache.groovy:groovy:4.0.23") + implementation("org.apache.groovy:groovy:4.0.24") } tasks.withType { diff --git a/reposilite-plugins/migration-plugin/build.gradle.kts b/reposilite-plugins/migration-plugin/build.gradle.kts index eb8b6e4d4..87da89b72 100644 --- a/reposilite-plugins/migration-plugin/build.gradle.kts +++ b/reposilite-plugins/migration-plugin/build.gradle.kts @@ -19,7 +19,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { id("com.github.johnrengelman.shadow") version "8.1.1" kotlin("jvm") - kotlin("plugin.serialization") version "2.0.20" + kotlin("plugin.serialization") version "2.0.21" } application { @@ -29,7 +29,7 @@ application { dependencies { compileOnly(project(":reposilite-backend")) testImplementation(project(":reposilite-backend")) - implementation("com.charleskorn.kaml:kaml-jvm:0.61.0") + implementation("com.charleskorn.kaml:kaml-jvm:0.65.0") } tasks.withType { diff --git a/reposilite-plugins/prometheus-plugin/build.gradle.kts b/reposilite-plugins/prometheus-plugin/build.gradle.kts index 1d9c0b7d2..03cfa986c 100644 --- a/reposilite-plugins/prometheus-plugin/build.gradle.kts +++ b/reposilite-plugins/prometheus-plugin/build.gradle.kts @@ -28,7 +28,7 @@ application { dependencies { compileOnly(project(":reposilite-backend")) - val prometheusMetrics = "1.3.2" + val prometheusMetrics = "1.3.3" implementation("io.prometheus:prometheus-metrics-core:$prometheusMetrics") implementation("io.prometheus:prometheus-metrics-instrumentation-jvm:$prometheusMetrics") implementation("io.prometheus:prometheus-metrics-exporter-common:$prometheusMetrics")