From 52d97d0658182309ea6f682e6aefa2748d52a9b1 Mon Sep 17 00:00:00 2001 From: Timon Back Date: Mon, 2 Oct 2023 12:38:50 +0200 Subject: [PATCH] Revert "chore(deps): Bump snakeyaml and kafka" (#384) This reverts commit 8cf45d4b --- dependencies.gradle | 9 ++------- .../springwolf-cloud-stream-example/build.gradle | 2 +- .../springwolf-kafka-example/build.gradle | 4 ++-- .../springwolf-cloud-stream-plugin/build.gradle | 2 +- springwolf-plugins/springwolf-kafka-plugin/build.gradle | 2 +- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0a18567a8..22f1304f5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -37,7 +37,8 @@ ext { jsr305Version = '3.0.2' - kafkaVersion = '3.5.1' + kafkaClientsVersion = '3.5.1' + kafkaStreamsVersion = '3.5.1' jacksonVersion = '2.15.2' jakartaAnnotationApiVersion = '2.1.1' @@ -58,9 +59,3 @@ ext { testcontainersVersion = '1.19.0' } - -// spring boot managed dependency versions -ext { - set('kafka.version', ext.kafkaVersion) - set('snakeyaml.version', '2.2') -} \ No newline at end of file diff --git a/springwolf-examples/springwolf-cloud-stream-example/build.gradle b/springwolf-examples/springwolf-cloud-stream-example/build.gradle index 024c37c9e..665d006e4 100644 --- a/springwolf-examples/springwolf-cloud-stream-example/build.gradle +++ b/springwolf-examples/springwolf-cloud-stream-example/build.gradle @@ -28,7 +28,7 @@ dependencies { runtimeOnly "org.springframework.boot:spring-boot-starter-actuator" implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}" - implementation "org.apache.kafka:kafka-streams:${kafkaVersion}" + implementation "org.apache.kafka:kafka-streams:${kafkaStreamsVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" implementation "io.swagger.core.v3:swagger-annotations:${swaggerVersion}" diff --git a/springwolf-examples/springwolf-kafka-example/build.gradle b/springwolf-examples/springwolf-kafka-example/build.gradle index 3437df1ec..d16d458d3 100644 --- a/springwolf-examples/springwolf-kafka-example/build.gradle +++ b/springwolf-examples/springwolf-kafka-example/build.gradle @@ -43,7 +43,7 @@ dependencies { testImplementation "com.vaadin.external.google:android-json:${androidJsonVersion}" - testImplementation "org.apache.kafka:kafka-clients:${kafkaVersion}@jar" + testImplementation "org.apache.kafka:kafka-clients:${kafkaClientsVersion}@jar" testImplementation "org.assertj:assertj-core:${assertjCoreVersion}" testImplementation "org.awaitility:awaitility:${awaitilityVersion}" testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}" @@ -57,7 +57,7 @@ dependencies { testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}" - permitTestUnusedDeclared "org.apache.kafka:kafka-clients:${kafkaVersion}:test@jar" + permitTestUnusedDeclared "org.apache.kafka:kafka-clients:${kafkaClientsVersion}:test@jar" testImplementation("org.springframework.boot:spring-boot-starter-actuator") permitTestUnusedDeclared("org.springframework.boot:spring-boot-starter-actuator") diff --git a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle index b17ebc847..bf9538520 100644 --- a/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle +++ b/springwolf-plugins/springwolf-cloud-stream-plugin/build.gradle @@ -32,7 +32,7 @@ dependencies { testRuntimeOnly "org.junit.jupiter:junit-jupiter:${junitJupiterVersion}" testImplementation "org.assertj:assertj-core:${assertjCoreVersion}" - testImplementation "org.apache.kafka:kafka-streams:${kafkaVersion}" + testImplementation "org.apache.kafka:kafka-streams:${kafkaStreamsVersion}" testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}" testImplementation "org.mockito:mockito-core:${mockitoCoreVersion}" diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index 8759f5da7..17ce7e236 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation "com.asyncapi:asyncapi-core:${asyncapiCoreVersion}" implementation "io.swagger.core.v3:swagger-models:${swaggerVersion}" - implementation "org.apache.kafka:kafka-clients:${kafkaVersion}" + implementation "org.apache.kafka:kafka-clients:${kafkaClientsVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" implementation "org.springframework:spring-beans"