chore(deps): upgrade Micronaut to 4.2 version (tchiotludo#1615)

Author: screpel

.github/workflows/codeql-analysis.yml

@@ -52,7 +52,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 17
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        java: ['11']
+        java: ['17']
 
     steps:
       - uses: actions/checkout@v2
@@ -71,7 +71,7 @@ jobs:
 
       # Shadow Jar, Tar and Zip
       - name: Build jars and distribution archives
-        if: success() && matrix.java == '11'
+        if: success() && matrix.java == '17'
         run: ./gradlew shadowJar distTar distZip --no-daemon
 
       # Upload artifacts
@@ -83,7 +83,7 @@ jobs:
 
       - name: Upload jar
         uses: actions/upload-artifact@v1
-        if: success() && matrix.java == '11'
+        if: success() && matrix.java == '17'
         with:
           name: jar
           path: build/libs/

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre
+FROM eclipse-temurin:17-jre
 
 # install curl
 RUN apt-get update && \

build.gradle

@@ -1,24 +1,27 @@
 plugins {
     // micronaut
     id "com.github.johnrengelman.shadow" version "8.1.1"
-    id "io.micronaut.application" version "3.7.10"
+    id "io.micronaut.application" version "4.2.0"
 
     // 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.3'
+    id 'com.adarshr.test-logger' version '4.0.0'
+    id 'org.gradle.test-retry' version '1.5.6'
     id 'com.github.psxpaul.execfork' version '0.2.2'
-    id "com.github.ben-manes.versions" version "0.47.0"
-    id "com.github.davidmc24.gradle.plugin.avro" version "1.7.1"
-
+    id "com.github.ben-manes.versions" version "0.49.0"
+    id "com.github.davidmc24.gradle.plugin.avro" version "1.9.1"
     // idea
     id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
 }
-
+java {
+    sourceCompatibility = JavaVersion.toVersion("17")
+    targetCompatibility = JavaVersion.toVersion("17")
+}
+application {
+    mainClass.set("org.akhq.App")
+}
 group "org.akhq"
 version "0.24.0"
-mainClassName = "org.akhq.App"
-sourceCompatibility = 11
 
 repositories {
     mavenLocal()
@@ -41,9 +44,6 @@ configurations.all {
         force("org.apache.kafka:kafka-server-common:" + kafkaVersion)
         force("org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion)
 
-        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.22.2")
     }
 }
@@ -75,29 +75,33 @@ micronaut {
  **********************************************************************************************************************/
 dependencies {
     // lombok
-    annotationProcessor "org.projectlombok:lombok:" + lombokVersion
-    compileOnly 'org.projectlombok:lombok:' + lombokVersion
+    annotationProcessor("org.projectlombok:lombok:" + lombokVersion)
+    compileOnly("org.projectlombok:lombok:" + lombokVersion)
 
     // micronaut
-    annotationProcessor "io.micronaut:micronaut-inject-java"
-    annotationProcessor "io.micronaut:micronaut-validation"
-    annotationProcessor 'io.micronaut.openapi:micronaut-openapi'
-    implementation "io.micronaut:micronaut-inject"
-    implementation "io.micronaut:micronaut-validation"
-    implementation "io.micronaut:micronaut-runtime"
-    implementation "io.micronaut:micronaut-http-server-netty"
-    implementation "io.swagger.core.v3:swagger-annotations"
-    runtimeOnly 'ch.qos.logback:logback-classic'
-    implementation "io.micronaut.security:micronaut-security-annotations"
-    implementation "io.micronaut.security:micronaut-security-jwt"
-    implementation "io.micronaut.security:micronaut-security-ldap"
-    implementation "io.micronaut.security:micronaut-security-oauth2"
-    implementation "io.micronaut:micronaut-management"
-    implementation 'io.micronaut.micrometer:micronaut-micrometer-registry-prometheus'
-    implementation "io.micronaut.cache:micronaut-cache-core"
-
-    implementation "io.micronaut.rxjava2:micronaut-rxjava2"
-    implementation "io.micronaut.rxjava2:micronaut-rxjava2-http-server-netty"
+    annotationProcessor("io.micronaut:micronaut-inject-java")
+    annotationProcessor("io.micronaut.validation:micronaut-validation-processor")
+    annotationProcessor("io.micronaut.openapi:micronaut-openapi")
+    implementation("io.micronaut:micronaut-inject")
+    implementation("io.micronaut:micronaut-runtime")
+    implementation("io.micronaut.validation:micronaut-validation")
+    implementation("io.micronaut:micronaut-http-client")
+    implementation("io.micronaut:micronaut-http-server-netty")
+    implementation("io.micronaut:micronaut-jackson-databind")
+    implementation("io.swagger.core.v3:swagger-annotations")
+    runtimeOnly("ch.qos.logback:logback-classic")
+    runtimeOnly("org.yaml:snakeyaml")
+    implementation("io.micronaut.security:micronaut-security-annotations")
+    implementation("io.micronaut.security:micronaut-security-jwt")
+    implementation("io.micronaut.security:micronaut-security-ldap")
+    implementation("io.micronaut.security:micronaut-security-oauth2")
+    implementation("io.micronaut:micronaut-management")
+    implementation("io.micronaut:micronaut-retry")
+    implementation("io.micronaut.micrometer:micronaut-micrometer-registry-prometheus")
+    implementation("io.micronaut.cache:micronaut-cache-core")
+
+    implementation("io.micronaut.rxjava2:micronaut-rxjava2")
+    implementation("io.micronaut.rxjava2:micronaut-rxjava2-http-server-netty")
 
     // kafka
     implementation group: "org.apache.kafka", name: "kafka_" + kafkaScalaVersion, version: kafkaVersion
@@ -109,11 +113,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.3")
 
     // strimzi
-    implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.13.0'
-    implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.13.0'
+    implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.14.0'
+    implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.14.0'
 
     // log
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha5'
@@ -122,33 +126,33 @@ dependencies {
 
     // utils
     implementation group: 'org.codehaus.httpcache4j.uribuilder', name: 'uribuilder', version: '2.0.0'
-    implementation 'com.google.guava:guava:32.0.1-jre'
+    implementation 'com.google.guava:guava:32.1.3-jre'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
 
     // avro
-    implementation 'org.apache.avro:avro:1.11.1'
+    implementation 'org.apache.avro:avro:1.11.0'
 
     // jackson-module-scala
     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.22.2'
-    implementation group: "com.google.protobuf", name: "protobuf-java-util", version: '3.22.2'
+    implementation group: "com.google.protobuf", name: "protobuf-java", version: '3.25.0'
+    implementation group: "com.google.protobuf", name: "protobuf-java-util", version: '3.25.0'
 
     // Password hashing
     implementation group: "org.mindrot", name: "jbcrypt", version: "0.4"
 
-    implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.17'
+    implementation group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.15'
     // api
 
     // client
     implementation project(":client")
 
     //AWS MSK IAM Auth
-    implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.7'
+    implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '2.0.0'
 
-    implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.3'
+    implementation group: 'io.projectreactor', name: 'reactor-core', version: '3.5.11'
 }
 
 /**********************************************************************************************************************\
@@ -165,22 +169,34 @@ test {
         maxRetries = 5
         maxFailures = 15
     }
+
+    retry {
+        maxRetries = 5
+        maxFailures = 15
+    }
 }
 
 dependencies {
-    testImplementation 'ch.qos.logback:logback-classic:1.2.9'
+    testImplementation 'ch.qos.logback:logback-classic'
 
     // micronaut test
     testAnnotationProcessor "org.projectlombok:lombok:" + lombokVersion
     testCompileOnly 'org.projectlombok:lombok:' + lombokVersion
 
     testAnnotationProcessor "io.micronaut:micronaut-inject-java"
-    testImplementation "io.micronaut.test:micronaut-test-junit5"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
-    testImplementation "org.junit.jupiter:junit-jupiter-api"
-    testImplementation "org.junit.jupiter:junit-jupiter-params"
-    testImplementation "io.micronaut:micronaut-http-client"
-    testImplementation "io.micronaut.rxjava2:micronaut-rxjava2-http-client"
+
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("io.micronaut.test:micronaut-test-junit5")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine")
+    testImplementation ("org.junit.jupiter:junit-jupiter-params")
+
+    testImplementation ("io.micronaut:micronaut-http-client")
+    testImplementation ("io.micronaut:micronaut-runtime")
+    testImplementation ("io.micronaut:micronaut-management")
+    testImplementation ("io.micronaut:micronaut-inject")
+    testImplementation ("io.micronaut.rxjava2:micronaut-rxjava2-http-client")
+    testImplementation("io.micronaut.test:micronaut-test-rest-assured")
 
     // test
     testImplementation "org.apache.kafka:kafka-clients:" + kafkaVersion + ":test"
@@ -200,10 +216,6 @@ dependencies {
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.4.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'
-    testImplementation 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.11'
 }
 
 testlogger {

docs/docs/dev.md

@@ -50,8 +50,8 @@ see [Kafka Getting started guide](https://kafka.apache.org/quickstart). In the n
 git clone https://github.com/tchiotludo/akhq.git
 ```
 
-Open the checked out directory in IntelliJ IDEA. The current version (0.16.0) of AKHQ is built with Java 11. If you
-don't have OpenJDK 11 installed already, do the following in IntelliJ IDEA:
+Open the checked out directory in IntelliJ IDEA. The current version (0.25.0) of AKHQ is built with Java 17. If you
+don't have OpenJDK 17 installed already, do the following in IntelliJ IDEA:
 * _File > Project Structure... > Platform Settings >
 SDKs > + > Download JDK... >_ select a vendor of your choice (but make sure it's version 11)
 * download + install. Make sure

docs/docs/installation.md

@@ -17,7 +17,7 @@ docker run -d \
 
 
 ### Stand Alone
-* Install Java 11
+* Install Java 17
 * Download the latest jar on [release page](https://github.com/tchiotludo/akhq/releases)
 * Create a [configuration file](./configuration/README.md)
 * Launch the application with `java -Dmicronaut.config.files=/path/to/application.yml -jar akhq.jar`

gradle.properties

@@ -1,5 +1,5 @@
-micronautVersion=3.9.4
-confluentVersion=7.4.1
-kafkaVersion=3.5.1
+micronautVersion=4.2.0
+confluentVersion=7.4.2
+kafkaVersion=3.6.0
 kafkaScalaVersion=2.13
-lombokVersion=1.18.28
+lombokVersion=1.18.30

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -10,10 +10,10 @@
 
 @Data
 public class BasicAuth {
-    String username;
-    String password;
-    PasswordHash passwordHash = PasswordHash.SHA256;
-    List<String> groups = new ArrayList<>();
+    private String username;
+    private String password;
+    private PasswordHash passwordHash = PasswordHash.SHA256;
+    private List<String> groups = new ArrayList<>();
 
     @SuppressWarnings("UnstableApiUsage")
     public boolean isValidPassword(String password) {

src/main/java/org/akhq/configs/security/BasicAuth.java

@@ -4,7 +4,7 @@
 import io.micronaut.context.annotation.Value;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
@@ -14,7 +14,7 @@
 @Slf4j
 @Context
 public class JwtSecurityWarning {
-    protected static String DEFAULT = "pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!" +
+    private static final String DEFAULT = "pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!" +
         "pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!" +
         "pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!pleasechangeme!";
 
@@ -29,13 +29,13 @@ public class JwtSecurityWarning {
 
     @PostConstruct
     public void start() {
-        if (enabled && secret.equals(DEFAULT)) {
+        if (Boolean.TRUE.equals(enabled) && secret.equals(DEFAULT)) {
             logSecurityWarning(() -> {
                 log.warn("You still use the default jwt secret.");
                 log.warn("This known secret can be used to impersonate anyone.");
                 log.warn("Please change 'micronaut.security.token.jwt.signatures.secret.generator.secret' configuration, or ask your administrator to do it !");
             });
-        } else if (!enabled && securityProperties.getGroups() != null && !securityProperties.getGroups().isEmpty()){
+        } else if (Boolean.FALSE.equals(enabled) && securityProperties.getGroups() != null && !securityProperties.getGroups().isEmpty()){
             logSecurityWarning(() -> {
                 log.warn("You have set a security group config but did not set the jwt secret.");
                 log.warn("This means that the API request will not be checked against the security group config.");

src/main/java/org/akhq/configs/security/JwtSecurityWarning.java

@@ -109,7 +109,7 @@ public AuthDefinition auths() {
         if (applicationContext.containsBean(SecurityService.class)) {
             authDefinition.loginEnabled = true;
             // Display login form if there are LocalUsers OR Ldap is enabled
-            authDefinition.formEnabled = securityProperties.getBasicAuth().size() > 0 ||
+            authDefinition.formEnabled = !securityProperties.getBasicAuth().isEmpty() ||
                 applicationContext.containsBean(LdapConfiguration.class);
 
             if (!authDefinition.formEnabled &&

src/main/java/org/akhq/controllers/AkhqController.java

@@ -1,6 +1,7 @@
 package org.akhq.controllers;
 
 import io.micronaut.core.annotation.Introspected;
+import io.micronaut.http.annotation.Body;
 import io.micronaut.http.annotation.Controller;
 import io.micronaut.http.annotation.Get;
 import io.micronaut.http.annotation.Post;
@@ -129,7 +130,7 @@ public List<Config> nodeConfig(String cluster, Integer nodeId) throws ExecutionE
     @AKHQSecured(resource = Role.Resource.NODE, action = Role.Action.ALTER_CONFIG)
     @Post("api/{cluster}/node/{nodeId}/configs")
     @Operation(tags = {"node"}, summary = "Update configs for a node")
-    public List<Config> nodeConfigUpdate(String cluster, Integer nodeId, Map<String, String> configs) throws ExecutionException, InterruptedException {
+    public List<Config> nodeConfigUpdate(String cluster, Integer nodeId, @Body Map<String, String> configs) throws ExecutionException, InterruptedException {
         checkIfClusterAndResourceAllowed(cluster, nodeId.toString());
 
         List<Config> updated = ConfigRepository.updatedConfigs(configs, this.configRepository.findByBroker(cluster, nodeId), false);