From 6334c667d8a7fdb7dec59100fbf13c6dc49c5253 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:52:42 +0000 Subject: [PATCH 1/2] fix(deps): update all non-major dependencies --- gradle/libs.versions.toml | 22 +++++++++++----------- recipes/gradle/libs.versions.toml | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aecfa61a..f1d06d12 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,19 +3,19 @@ kotlin = "2.1.0" kotlinx = "1.10.1" spring-boot = "2.7.18" spring-framework = "5.3.39" -spring-framework-6x = "6.2.1" +spring-framework-6x = "6.2.2" spring-boot-3x = "3.4.1" spring-dependency-management = "1.1.7" spring-kafka = "2.9.13" spring-kafka-3x = "3.3.1" -couchbase-client = "3.7.6" -couchbase-client-metrics = "0.7.6" -couchbase-kotlin = "1.4.6" +couchbase-client = "3.7.7" +couchbase-client-metrics = "0.7.7" +couchbase-kotlin = "1.4.7" jackson = "2.18.2" arrow = "2.0.0" arrowSuspendApp = "0.4.0" arrow-jackson = "0.14.1" -io-reactor = "3.7.1" +io-reactor = "3.7.2" io-reactor-extensions = "1.2.3" slf4j = "2.0.16" kafka = "3.9.0" @@ -28,15 +28,15 @@ ktor = "2.3.13" koin = "4.0.1" r2dbc-spi = "1.0.0.RELEASE" r2dbc-postgresql = "0.8.13.RELEASE" -elastic = "8.17.0" +elastic = "8.17.1" mongodb = "5.3.0" wiremock = "3.10.0" testcontainers = "1.20.4" r2dbc-mssql = "1.0.2.RELEASE" -spotless = "7.0.1" +spotless = "7.0.2" detekt = "1.23.7" wire = "5.2.1" -io-grpc = "1.69.0" +io-grpc = "1.69.1" io-grpc-kotlin = "1.4.1" google-protobuf = "3.25.5" gradle-release = "3.1.0" @@ -48,7 +48,7 @@ kotest = "6.0.0.M1" mockito = "5.4.0" quiver = "0.5.12" akkurate = "0.11.0" -exposed = "0.57.0" +exposed = "0.58.0" kotlinx-serialization = "1.8.0" ktlint = "1.5.0" kotlinBinaryCompatibilityValidator = "0.17.0" @@ -129,7 +129,7 @@ r2dbc-spi = { module = "io.r2dbc:r2dbc-spi", version.ref = "r2dbc-spi" } r2dbc-postgresql = { module = "io.r2dbc:r2dbc-postgresql", version.ref = "r2dbc-postgresql" } # postgres -postgresql = { module = "org.postgresql:postgresql", version = "42.7.4" } +postgresql = { module = "org.postgresql:postgresql", version = "42.7.5" } # elastic elastic = { module = "co.elastic.clients:elasticsearch-java", version.ref = "elastic" } @@ -197,7 +197,7 @@ hoplite-yaml = { module = "com.sksamuel.hoplite:hoplite-yaml", version.ref = "ho google-gson = { module = "com.google.code.gson:gson", version = "2.11.0" } -caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.1.8" } +caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.2.0" } pprint = { module = "io.exoquery:pprint-kotlin", version = "3.0.0" } mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockito" } diff --git a/recipes/gradle/libs.versions.toml b/recipes/gradle/libs.versions.toml index 8cf74701..962aa51b 100644 --- a/recipes/gradle/libs.versions.toml +++ b/recipes/gradle/libs.versions.toml @@ -3,12 +3,12 @@ kotlin = "2.1.0" kotlinx = "1.10.1" scala2x = "2.13.16" scala3x = "3.4.1" -quarkus = "3.17.6" +quarkus = "3.17.7" ktlint = "1.5.0" # Spring-Boot spring-boot = "3.4.1" -spring-framework = "6.2.1" +spring-framework = "6.2.2" spring-dependency-management = "1.1.7" spring-kafka = "3.3.1" @@ -21,9 +21,9 @@ arrowSuspendApp = "0.4.0" jackson = "2.18.2" # Couchbase -couchbase-kotlin = "1.4.6" -couchbase-client = "3.7.6" -couchbase-client-metrics = "0.7.6" +couchbase-kotlin = "1.4.7" +couchbase-client = "3.7.7" +couchbase-client-metrics = "0.7.7" # Kafka kafka = "3.9.0" @@ -31,7 +31,7 @@ kafka-kotlin = "0.4.0" kafka-streams-registry = "7.8.0" # Reactor -io-reactor = "3.7.1" +io-reactor = "3.7.2" io-reactor-extensions = "1.2.3" # Logging @@ -51,7 +51,7 @@ r2dbc-postgresql = "0.8.13.RELEASE" r2dbc-mssql = "1.0.2.RELEASE" # elastic -elastic = "8.17.0" +elastic = "8.17.1" # mongo mongodb = "5.3.0" @@ -62,7 +62,7 @@ io-grpc-kotlin = "1.4.1" # Tooling kover = "0.9.1" -spotless = "7.0.1" +spotless = "7.0.2" detekt = "1.23.7" lombok = "1.18.36" From 48b0099769d01ae248ce61a074a7877d241d59b2 Mon Sep 17 00:00:00 2001 From: Oguzhan Soykan Date: Tue, 21 Jan 2025 14:30:39 +0100 Subject: [PATCH 2/2] fix build --- build.gradle.kts | 11 ----------- .../stove/testing/e2e/standalone/kafka/Caching.kt | 2 +- .../trendyol/stove/testing/e2e/wiremock/Extensions.kt | 2 +- .../com/trendyol/stove/testing/e2e/kafka/Caching.kt | 2 +- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f69f1d27..9258ad9f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,9 @@ import org.gradle.kotlin.dsl.libs import org.gradle.plugins.ide.idea.model.IdeaModel -import org.jetbrains.dokka.gradle.DokkaMultiModuleTask import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { kotlin("jvm").version(libs.versions.kotlin) - alias(libs.plugins.dokka) alias(libs.plugins.spotless) alias(libs.plugins.testLogger) alias(libs.plugins.kover) @@ -18,10 +16,6 @@ plugins { group = "com.trendyol" version = CI.version(project) -allprojects { - extra.set("dokka.outputDirectory", rootDir.resolve("docs")) -} - kover { reports { filters { @@ -53,7 +47,6 @@ subprojects.of("lib", "spring", "examples", "ktor") { apply { plugin("kotlin") plugin(rootProject.libs.plugins.spotless.get().pluginId) - plugin(rootProject.libs.plugins.dokka.get().pluginId) plugin(rootProject.libs.plugins.testLogger.get().pluginId) plugin(rootProject.libs.plugins.kover.get().pluginId) plugin(rootProject.libs.plugins.detekt.get().pluginId) @@ -156,7 +149,3 @@ subprojects.of("lib", "spring", "ktor", filter = { p -> publishedProjects.contai } } -tasks.withType().configureEach { - outputDirectory.set(file(rootDir.resolve("docs/source"))) -} - diff --git a/lib/stove-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/standalone/kafka/Caching.kt b/lib/stove-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/standalone/kafka/Caching.kt index e0a73d23..c047c7c6 100644 --- a/lib/stove-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/standalone/kafka/Caching.kt +++ b/lib/stove-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/standalone/kafka/Caching.kt @@ -3,5 +3,5 @@ package com.trendyol.stove.testing.e2e.standalone.kafka import com.github.benmanes.caffeine.cache.* object Caching { - fun of(): Cache = Caffeine.newBuilder().build() + fun of(): Cache = Caffeine.newBuilder().build() } diff --git a/lib/stove-testing-e2e-wiremock/src/main/kotlin/com/trendyol/stove/testing/e2e/wiremock/Extensions.kt b/lib/stove-testing-e2e-wiremock/src/main/kotlin/com/trendyol/stove/testing/e2e/wiremock/Extensions.kt index d25ae64a..0d9ee414 100644 --- a/lib/stove-testing-e2e-wiremock/src/main/kotlin/com/trendyol/stove/testing/e2e/wiremock/Extensions.kt +++ b/lib/stove-testing-e2e-wiremock/src/main/kotlin/com/trendyol/stove/testing/e2e/wiremock/Extensions.kt @@ -2,4 +2,4 @@ package com.trendyol.stove.testing.e2e.wiremock import com.github.benmanes.caffeine.cache.Cache -fun Cache.containsKey(key: K): Boolean = this.getIfPresent(key) != null +fun Cache.containsKey(key: K): Boolean = this.getIfPresent(key) != null diff --git a/starters/spring/stove-spring-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/kafka/Caching.kt b/starters/spring/stove-spring-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/kafka/Caching.kt index 46be8439..a299fd49 100644 --- a/starters/spring/stove-spring-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/kafka/Caching.kt +++ b/starters/spring/stove-spring-testing-e2e-kafka/src/main/kotlin/com/trendyol/stove/testing/e2e/kafka/Caching.kt @@ -3,5 +3,5 @@ package com.trendyol.stove.testing.e2e.kafka import com.github.benmanes.caffeine.cache.* object Caching { - fun of(): Cache = Caffeine.newBuilder().build() + fun of(): Cache = Caffeine.newBuilder().build() }