From 315fcbd2aca364d7c15c835ceb4bd7f47d8e76fa Mon Sep 17 00:00:00 2001 From: Ludovic DEHON Date: Sun, 12 Mar 2023 23:23:38 +0100 Subject: [PATCH] chore(deps): update all java deps --- build.gradle | 32 +++++++++---------- client/build.gradle | 4 +++ gradle.properties | 5 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- .../controllers/KsqlDbControllerTest.java | 2 +- .../repositories/KsqlDbRepositoryTest.java | 2 +- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 56cd6be99..9a1f87395 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ plugins { // micronaut - id "com.github.johnrengelman.shadow" version "7.1.2" - id "io.micronaut.application" version "3.7.0" + id "com.github.johnrengelman.shadow" version "8.1.0" + id "io.micronaut.application" version "3.7.5" // akhq id "com.gorylenko.gradle-git-properties" version "2.4.1" id 'com.adarshr.test-logger' version '3.2.0' - id 'org.gradle.test-retry' version '1.5.1' + id 'org.gradle.test-retry' version '1.5.2' id 'com.github.psxpaul.execfork' version '0.2.2' - id "com.github.ben-manes.versions" version "0.45.0" + id "com.github.ben-manes.versions" version "0.46.0" id "com.github.davidmc24.gradle.plugin.avro" version "1.6.0" } @@ -41,7 +41,7 @@ configurations.all { force("org.slf4j:slf4j-api:1.7.32") force("org.slf4j:jul-to-slf4j:1.7.32") force("org.slf4j:log4j-over-slf4j:1.7.32") - force("com.google.protobuf:protobuf-java:3.20.3") + force("com.google.protobuf:protobuf-java:3.22.2") } } @@ -90,7 +90,7 @@ dependencies { implementation group: "org.apache.kafka", name: "kafka_" + kafkaScalaVersion, version: kafkaVersion implementation group: "org.apache.kafka", name: "kafka-clients", version: kafkaVersion implementation group: "org.apache.kafka", name: "kafka-streams", version: kafkaVersion - implementation group: "io.confluent.ksql", name: "ksqldb-api-client", version: ksqlApiClientVersion + implementation group: "io.confluent.ksql", name: "ksqldb-api-client", version: confluentVersion implementation group: "io.confluent", name: "kafka-schema-registry-client", version: confluentVersion implementation group: "io.confluent", name: "kafka-avro-serializer", version: confluentVersion implementation group: "io.confluent", name: "kafka-json-schema-serializer", version: confluentVersion @@ -99,8 +99,8 @@ dependencies { implementation 'org.sourcelab:kafka-connect-client:4.0.3' // strimzi - implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.11.0' - implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.11.0' + implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.12.0' + implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.12.0' // log implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha5' @@ -120,14 +120,13 @@ dependencies { implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.13', version: '2.13.4' // protobuf - implementation group: "com.google.protobuf", name: "protobuf-java", version: '3.21.9' - implementation group: "com.google.protobuf", name: "protobuf-java-util", version: '3.21.9' + implementation group: "com.google.protobuf", name: "protobuf-java", version: '3.22.2' + implementation group: "com.google.protobuf", name: "protobuf-java-util", version: '3.22.2' // Password hashing implementation group: "org.mindrot", name: "jbcrypt", version: "0.4" - // https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all - implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.15' + implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.16' // api // client @@ -136,8 +135,7 @@ dependencies { //AWS MSK IAM Auth implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.6' - // https://mvnrepository.com/artifact/io.projectreactor/reactor-core - implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.1' + implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.3' } /**********************************************************************************************************************\ @@ -179,7 +177,7 @@ dependencies { testImplementation "io.confluent:kafka-schema-registry:" + confluentVersion + ":tests" testImplementation "org.apache.kafka:connect-runtime:" + kafkaVersion testImplementation "org.apache.kafka:connect-file:" + kafkaVersion - testImplementation 'io.confluent.ksql:ksqldb-rest-app:' + ksqlApiClientVersion + testImplementation 'io.confluent.ksql:ksqldb-rest-app:' + confluentVersion testImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: kafkaVersion testImplementation group: "io.confluent", name: "kafka-streams-avro-serde", version: confluentVersion @@ -187,8 +185,8 @@ dependencies { testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.15' testImplementation 'org.hamcrest:hamcrest:2.2' testImplementation 'org.hamcrest:hamcrest-library:2.2' - testImplementation 'org.mockito:mockito-junit-jupiter:4.8.1' - testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.4' + testImplementation 'org.mockito:mockito-junit-jupiter:5.2.0' + testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.5' testImplementation 'com.fasterxml.jackson.core:jackson-core:' testImplementation 'com.fasterxml.jackson.core:jackson-annotations' testImplementation 'com.fasterxml.jackson.core:jackson-databind' diff --git a/client/build.gradle b/client/build.gradle index f2f9d7057..3ade7d213 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -40,3 +40,7 @@ tasks.named('assembleFrontend') { tasks.named('checkFrontend') { enabled = false } + +copyClientResources { + dependsOn(':inspectRuntimeClasspath') +} diff --git a/gradle.properties b/gradle.properties index 4cafed3ae..0dec116d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ micronautVersion=3.8.7 -confluentVersion=7.3.1 -kafkaVersion=3.3.1 +confluentVersion=7.3.2 +kafkaVersion=3.4.0 kafkaScalaVersion=2.13 lombokVersion=1.18.26 -ksqlApiClientVersion=7.3.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee..e1bef7e87 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-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/java/org/akhq/controllers/KsqlDbControllerTest.java b/src/test/java/org/akhq/controllers/KsqlDbControllerTest.java index 74f067d4c..facf5d8ab 100644 --- a/src/test/java/org/akhq/controllers/KsqlDbControllerTest.java +++ b/src/test/java/org/akhq/controllers/KsqlDbControllerTest.java @@ -20,7 +20,7 @@ class KsqlDbControllerTest extends AbstractTest { void info() { KsqlDbServerInfo serverInfo = this.retrieve(HttpRequest.GET(BASE_URL + "/info"), KsqlDbServerInfo.class); assertNotNull(serverInfo.getKafkaClusterId()); - assertEquals("7.3.1", serverInfo.getServerVersion()); + assertEquals("7.3.2", serverInfo.getServerVersion()); assertEquals("ksql", serverInfo.getKsqlServiceId()); } diff --git a/src/test/java/org/akhq/repositories/KsqlDbRepositoryTest.java b/src/test/java/org/akhq/repositories/KsqlDbRepositoryTest.java index 7fa416b3b..879c671d6 100644 --- a/src/test/java/org/akhq/repositories/KsqlDbRepositoryTest.java +++ b/src/test/java/org/akhq/repositories/KsqlDbRepositoryTest.java @@ -68,7 +68,7 @@ void cleanup() { void getServerInfo() { KsqlDbServerInfo serverInfo = repository.getServerInfo(KafkaTestCluster.CLUSTER_ID, "ksqldb"); assertNotNull(serverInfo.getKafkaClusterId()); - assertEquals("7.3.1", serverInfo.getServerVersion()); + assertEquals("7.3.2", serverInfo.getServerVersion()); assertEquals("ksql", serverInfo.getKsqlServiceId()); }