Skip to content

Commit

Permalink
chore(deps): update most java deps
Browse files Browse the repository at this point in the history
  • Loading branch information
tchiotludo committed Apr 15, 2024
1 parent 090c1cd commit c757938
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 23 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ jobs:
./gradlew classes testClasses --parallel --no-daemon
./gradlew check --no-daemon
# report test
- name: Test Report
uses: mikepenz/action-junit-report@v4
if: success() || failure()
with:
report_paths: '**/build/test-results/**/TEST-*.xml'

# Shadow Jar, Tar and Zip
- name: Build jars and distribution archives
if: success()
Expand Down
35 changes: 19 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// micronaut
id "com.github.johnrengelman.shadow" version "8.1.1"
id "io.micronaut.application" version "4.2.1"
id "io.micronaut.application" version "4.3.6"

// akhq
id "com.gorylenko.gradle-git-properties" version "2.4.1"
Expand All @@ -11,7 +11,7 @@ plugins {
id "com.github.ben-manes.versions" version "0.51.0"
id "com.github.davidmc24.gradle.plugin.avro" version "1.9.1"
// idea
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.8"
}
java {
sourceCompatibility = JavaVersion.toVersion("17")
Expand Down Expand Up @@ -43,9 +43,12 @@ configurations.all {
force("org.apache.kafka:kafka-streams:" + kafkaVersion)
force("org.apache.kafka:kafka-server-common:" + kafkaVersion)
force("org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion)

force("com.google.protobuf:protobuf-java:3.25.2")
force("com.fasterxml.jackson.core:jackson-databind:2.16.0")
force("com.fasterxml.jackson:jackson-bom:" + jacksonVersion)
force("com.fasterxml.jackson.core:jackson-core:" + jacksonVersion)
force("com.fasterxml.jackson.core:jackson-databind:" + jacksonVersion)
force("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:" + jacksonVersion)
force("com.fasterxml.jackson.module:jackson-module-scala_" + kafkaScalaVersion + ":" + jacksonVersion)
}
}

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

// strimzi
implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.14.0'
implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.14.0'
implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.15.0'
implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.15.0'

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

// utils
implementation group: 'org.codehaus.httpcache4j.uribuilder', name: 'uribuilder', version: '2.0.0'
implementation 'com.google.guava:guava:33.0.0-jre'
implementation 'com.google.guava:guava:33.1.0-jre'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
Expand All @@ -145,22 +148,22 @@ dependencies {
// Password hashing
implementation group: "org.mindrot", name: "jbcrypt", version: "0.4"

implementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.18'
implementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.21'
// api

// client
implementation project(":client")

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

// AWS Glue serde
implementation ("software.amazon.glue:schema-registry-serde:1.1.18")
implementation ("software.amazon.glue:schema-registry-serde:1.1.19")


implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.6.2'
implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.6.5'

implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
implementation 'io.jsonwebtoken:jjwt-impl:0.12.5'
}

/**********************************************************************************************************************\
Expand Down Expand Up @@ -219,13 +222,13 @@ dependencies {
testImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: kafkaVersion
testImplementation group: "io.confluent", name: "kafka-streams-avro-serde", version: confluentVersion
testImplementation "io.confluent:kafka-connect-avro-converter:" + confluentVersion
testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.16.0'
testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.16.1'
testImplementation 'org.hamcrest:hamcrest:2.2'
testImplementation 'org.hamcrest:hamcrest-library:2.2'
testImplementation 'org.mockito:mockito-junit-jupiter:5.4.0'
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.5'

testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.awaitility:awaitility:4.2.1'
}

testlogger {
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
micronautVersion=4.2.4
micronautVersion=4.3.8
confluentVersion=7.4.4
kafkaVersion=3.6.1
kafkaScalaVersion=2.13
lombokVersion=1.18.30
jacksonVersion=2.16.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.nimbusds.jwt.PlainJWT;
import io.micronaut.core.async.publisher.Publishers;
import io.micronaut.security.authentication.*;
import io.micronaut.security.authentication.provider.ReactiveAuthenticationProvider;
import io.micronaut.security.oauth2.client.DefaultOpenIdProviderMetadata;
import io.micronaut.security.oauth2.endpoint.token.request.TokenEndpointClient;
import io.micronaut.security.oauth2.endpoint.token.response.OpenIdClaims;
Expand Down Expand Up @@ -36,9 +37,10 @@
@MicronautTest(environments = "oidc")
class OidcAuthenticationProviderTest {

@SuppressWarnings("rawtypes")
@Named("oidc")
@Inject
AuthenticationProvider oidcProvider;
ReactiveAuthenticationProvider oidcProvider;

@Inject
TokenEndpointClient tokenEndpointClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import com.nimbusds.jwt.JWTClaimsSet;
import com.nimbusds.jwt.PlainJWT;
import io.micronaut.core.async.publisher.Publishers;
import io.micronaut.security.authentication.*;
import io.micronaut.security.authentication.AuthenticationFailed;
import io.micronaut.security.authentication.AuthenticationResponse;
import io.micronaut.security.authentication.UsernamePasswordCredentials;
import io.micronaut.security.authentication.provider.ReactiveAuthenticationProvider;
import io.micronaut.security.oauth2.client.DefaultOpenIdProviderMetadata;
import io.micronaut.security.oauth2.endpoint.token.request.TokenEndpointClient;
import io.micronaut.security.oauth2.endpoint.token.response.OpenIdClaims;
Expand All @@ -13,13 +16,13 @@
import io.micronaut.test.annotation.MockBean;
import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
import io.reactivex.Flowable;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import org.akhq.configs.security.Group;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;

import jakarta.inject.Inject;
import jakarta.inject.Named;
import java.util.List;
import java.util.Map;
import java.util.Optional;
Expand All @@ -33,9 +36,10 @@
@MicronautTest(environments = "keycloak")
class OidcDirectClaimAuthenticationProviderTest {

@SuppressWarnings("rawtypes")
@Named("oidc")
@Inject
AuthenticationProvider oidcProvider;
ReactiveAuthenticationProvider oidcProvider;

@Inject
TokenEndpointClient tokenEndpointClient;
Expand Down

0 comments on commit c757938

Please sign in to comment.