Skip to content

Commit c757938

Browse files
committed
chore(deps): update most java deps
1 parent 090c1cd commit c757938

File tree

7 files changed

+40
-23
lines changed

7 files changed

+40
-23
lines changed

.github/workflows/main.yml

+7
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ jobs:
6666
./gradlew classes testClasses --parallel --no-daemon
6767
./gradlew check --no-daemon
6868
69+
# report test
70+
- name: Test Report
71+
uses: mikepenz/action-junit-report@v4
72+
if: success() || failure()
73+
with:
74+
report_paths: '**/build/test-results/**/TEST-*.xml'
75+
6976
# Shadow Jar, Tar and Zip
7077
- name: Build jars and distribution archives
7178
if: success()

build.gradle

+19-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
// micronaut
33
id "com.github.johnrengelman.shadow" version "8.1.1"
4-
id "io.micronaut.application" version "4.2.1"
4+
id "io.micronaut.application" version "4.3.6"
55

66
// akhq
77
id "com.gorylenko.gradle-git-properties" version "2.4.1"
@@ -11,7 +11,7 @@ plugins {
1111
id "com.github.ben-manes.versions" version "0.51.0"
1212
id "com.github.davidmc24.gradle.plugin.avro" version "1.9.1"
1313
// idea
14-
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
14+
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.8"
1515
}
1616
java {
1717
sourceCompatibility = JavaVersion.toVersion("17")
@@ -43,9 +43,12 @@ configurations.all {
4343
force("org.apache.kafka:kafka-streams:" + kafkaVersion)
4444
force("org.apache.kafka:kafka-server-common:" + kafkaVersion)
4545
force("org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion)
46-
4746
force("com.google.protobuf:protobuf-java:3.25.2")
48-
force("com.fasterxml.jackson.core:jackson-databind:2.16.0")
47+
force("com.fasterxml.jackson:jackson-bom:" + jacksonVersion)
48+
force("com.fasterxml.jackson.core:jackson-core:" + jacksonVersion)
49+
force("com.fasterxml.jackson.core:jackson-databind:" + jacksonVersion)
50+
force("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:" + jacksonVersion)
51+
force("com.fasterxml.jackson.module:jackson-module-scala_" + kafkaScalaVersion + ":" + jacksonVersion)
4952
}
5053
}
5154

@@ -114,11 +117,11 @@ dependencies {
114117
implementation group: "io.confluent", name: "kafka-json-schema-serializer", version: confluentVersion
115118
implementation group: "io.confluent", name: "kafka-protobuf-serializer", version: confluentVersion
116119
implementation group: "io.confluent", name: "kafka-client-plugins", version: confluentVersion + "-ce"
117-
implementation ("org.sourcelab:kafka-connect-client:4.0.3")
120+
implementation ("org.sourcelab:kafka-connect-client:4.0.4")
118121

119122
// strimzi
120-
implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.14.0'
121-
implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.14.0'
123+
implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.15.0'
124+
implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.15.0'
122125

123126
// log
124127
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha5'
@@ -127,7 +130,7 @@ dependencies {
127130

128131
// utils
129132
implementation group: 'org.codehaus.httpcache4j.uribuilder', name: 'uribuilder', version: '2.0.0'
130-
implementation 'com.google.guava:guava:33.0.0-jre'
133+
implementation 'com.google.guava:guava:33.1.0-jre'
131134
implementation 'com.google.code.gson:gson:2.10.1'
132135
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
133136
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
@@ -145,22 +148,22 @@ dependencies {
145148
// Password hashing
146149
implementation group: "org.mindrot", name: "jbcrypt", version: "0.4"
147150

148-
implementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.18'
151+
implementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.21'
149152
// api
150153

151154
// client
152155
implementation project(":client")
153156

154157
//AWS MSK IAM Auth
155-
implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '2.0.3'
158+
implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '2.1.0'
156159

157160
// AWS Glue serde
158-
implementation ("software.amazon.glue:schema-registry-serde:1.1.18")
161+
implementation ("software.amazon.glue:schema-registry-serde:1.1.19")
159162

160163

161-
implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.6.2'
164+
implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.6.5'
162165

163-
implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
166+
implementation 'io.jsonwebtoken:jjwt-impl:0.12.5'
164167
}
165168

166169
/**********************************************************************************************************************\
@@ -219,13 +222,13 @@ dependencies {
219222
testImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: kafkaVersion
220223
testImplementation group: "io.confluent", name: "kafka-streams-avro-serde", version: confluentVersion
221224
testImplementation "io.confluent:kafka-connect-avro-converter:" + confluentVersion
222-
testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.16.0'
225+
testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.16.1'
223226
testImplementation 'org.hamcrest:hamcrest:2.2'
224227
testImplementation 'org.hamcrest:hamcrest-library:2.2'
225-
testImplementation 'org.mockito:mockito-junit-jupiter:5.4.0'
228+
testImplementation 'org.mockito:mockito-junit-jupiter'
226229
testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.5'
227230

228-
testImplementation 'org.awaitility:awaitility:4.2.0'
231+
testImplementation 'org.awaitility:awaitility:4.2.1'
229232
}
230233

231234
testlogger {

gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
micronautVersion=4.2.4
1+
micronautVersion=4.3.8
22
confluentVersion=7.4.4
33
kafkaVersion=3.6.1
44
kafkaScalaVersion=2.13
55
lombokVersion=1.18.30
6+
jacksonVersion=2.16.1

gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/test/java/org/akhq/security/authentication/OidcAuthenticationProviderTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.nimbusds.jwt.PlainJWT;
66
import io.micronaut.core.async.publisher.Publishers;
77
import io.micronaut.security.authentication.*;
8+
import io.micronaut.security.authentication.provider.ReactiveAuthenticationProvider;
89
import io.micronaut.security.oauth2.client.DefaultOpenIdProviderMetadata;
910
import io.micronaut.security.oauth2.endpoint.token.request.TokenEndpointClient;
1011
import io.micronaut.security.oauth2.endpoint.token.response.OpenIdClaims;
@@ -36,9 +37,10 @@
3637
@MicronautTest(environments = "oidc")
3738
class OidcAuthenticationProviderTest {
3839

40+
@SuppressWarnings("rawtypes")
3941
@Named("oidc")
4042
@Inject
41-
AuthenticationProvider oidcProvider;
43+
ReactiveAuthenticationProvider oidcProvider;
4244

4345
@Inject
4446
TokenEndpointClient tokenEndpointClient;

src/test/java/org/akhq/security/claim/OidcDirectClaimAuthenticationProviderTest.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
import com.nimbusds.jwt.JWTClaimsSet;
55
import com.nimbusds.jwt.PlainJWT;
66
import io.micronaut.core.async.publisher.Publishers;
7-
import io.micronaut.security.authentication.*;
7+
import io.micronaut.security.authentication.AuthenticationFailed;
8+
import io.micronaut.security.authentication.AuthenticationResponse;
9+
import io.micronaut.security.authentication.UsernamePasswordCredentials;
10+
import io.micronaut.security.authentication.provider.ReactiveAuthenticationProvider;
811
import io.micronaut.security.oauth2.client.DefaultOpenIdProviderMetadata;
912
import io.micronaut.security.oauth2.endpoint.token.request.TokenEndpointClient;
1013
import io.micronaut.security.oauth2.endpoint.token.response.OpenIdClaims;
@@ -13,13 +16,13 @@
1316
import io.micronaut.test.annotation.MockBean;
1417
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
1518
import io.reactivex.Flowable;
19+
import jakarta.inject.Inject;
20+
import jakarta.inject.Named;
1621
import org.akhq.configs.security.Group;
1722
import org.junit.jupiter.api.Test;
1823
import org.mockito.ArgumentMatchers;
1924
import org.mockito.Mockito;
2025

21-
import jakarta.inject.Inject;
22-
import jakarta.inject.Named;
2326
import java.util.List;
2427
import java.util.Map;
2528
import java.util.Optional;
@@ -33,9 +36,10 @@
3336
@MicronautTest(environments = "keycloak")
3437
class OidcDirectClaimAuthenticationProviderTest {
3538

39+
@SuppressWarnings("rawtypes")
3640
@Named("oidc")
3741
@Inject
38-
AuthenticationProvider oidcProvider;
42+
ReactiveAuthenticationProvider oidcProvider;
3943

4044
@Inject
4145
TokenEndpointClient tokenEndpointClient;

0 commit comments

Comments
 (0)