chore(deps): update all java deps and remove bintray

build.gradle

@@ -1,21 +1,15 @@
-
-
 plugins {
     // micronaut
-    id "io.spring.dependency-management" version "1.0.10.RELEASE"
-    id "com.github.johnrengelman.shadow" version "6.0.0"
-    id "application"
-    id "java"
-    id "net.ltgt.apt-eclipse" version "0.21"
-    id "net.ltgt.apt-idea" version "0.21"
-    id "com.gorylenko.gradle-git-properties" version "2.2.3"
+    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "io.micronaut.application" version "1.5.0"
 
     // akhq
-    id 'com.adarshr.test-logger' version '2.1.0'
-    id 'org.gradle.test-retry' version '1.1.9'
-    id 'com.github.psxpaul.execfork' version '0.1.13'
-    id "com.github.ben-manes.versions" version "0.28.0"
-    id "com.commercehub.gradle.plugin.avro" version "0.21.0"
+    id "com.gorylenko.gradle-git-properties" version "2.3.1"
+    id 'com.adarshr.test-logger' version '3.0.0'
+    id 'org.gradle.test-retry' version '1.2.1'
+    id 'com.github.psxpaul.execfork' version '0.1.15'
+    id "com.github.ben-manes.versions" version "0.38.0"
+    id "com.github.davidmc24.gradle.plugin.avro" version "1.2.0"
 }
 
 group "org.akhq"
@@ -26,61 +20,40 @@ sourceCompatibility = 11
 repositories {
     mavenLocal()
     mavenCentral()
-    jcenter()
-    maven { url 'http://packages.confluent.io/maven/' }
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+    maven { url 'https://packages.confluent.io/maven/' }
     maven { url 'https://jitpack.io' }
 }
 
-idea {
-    module {
-        downloadJavadoc = false
-        downloadSources = true
-    }
-}
 
 configurations.all {
-    exclude  group: 'org.slf4j', module: 'slf4j-log4j12'
-    exclude  group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
-    exclude  group: 'org.apache.logging.log4j', module: 'log4j-core'
-    exclude  group: 'org.apache.logging.log4j', module: 'log4j-api'
+    exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    exclude group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl'
+    exclude group: 'org.apache.logging.log4j', module: 'log4j-core'
+    exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
+
+    resolutionStrategy {
+        force("org.apache.kafka:kafka-clients:" + kafkaVersion)
+        force("org.apache.kafka:kafka-streams:" + kafkaVersion)
+        force("org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion)
+    }
 }
 
-
 /**********************************************************************************************************************\
  * Micronaut
  **********************************************************************************************************************/
-dependencyManagement {
-    imports {
-        mavenBom "io.micronaut:micronaut-bom:$micronautVersion"
+micronaut {
+    runtime("netty")
+    testRuntime("junit5")
+    processing {
+        incremental(true)
+        annotations("org.akhq.*")
     }
 }
 
-configurations {
-    developmentOnly
-}
-
-run.classpath += configurations.developmentOnly
-test.classpath += configurations.developmentOnly
-run.jvmArgs('-noverify',
-        '-XX:TieredStopAtLevel=1',
-        '-Dmicronaut.environments=dev',
-        '-Dmicronaut.io.watch.restart=true'
-)
-
-tasks.withType(JavaCompile){
-    options.encoding = "UTF-8"
-    options.compilerArgs.add('-parameters')
-}
-
 /**********************************************************************************************************************\
  * Dependencies
  **********************************************************************************************************************/
 dependencies {
-    // strimzi
-    implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.7.0'
-    implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.7.0'
-
     // lombok
     annotationProcessor "org.projectlombok:lombok:" + lombokVersion
     compileOnly 'org.projectlombok:lombok:' + lombokVersion
@@ -95,7 +68,7 @@ dependencies {
     implementation "io.micronaut:micronaut-http-client"
     implementation "io.micronaut:micronaut-http-server-netty"
     implementation "io.swagger.core.v3:swagger-annotations"
-    runtimeOnly "ch.qos.logback:logback-classic:1.2.3"
+    runtimeOnly 'ch.qos.logback:logback-classic:1.3.0-alpha5'
     implementation "io.micronaut.security:micronaut-security-annotations"
     implementation "io.micronaut.security:micronaut-security-jwt"
     implementation "io.micronaut.security:micronaut-security-ldap"
@@ -108,25 +81,56 @@ dependencies {
     implementation group: "org.apache.kafka", name: "kafka-clients", version: kafkaVersion
     implementation group: "io.confluent", name: "kafka-schema-registry-client", version: confluentVersion
     implementation group: "io.confluent", name: "kafka-avro-serializer", version: confluentVersion
+    implementation 'org.sourcelab:kafka-connect-client:3.1.1'
+
+    // strimzi
+    implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.7.2'
+    implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.7.2'
 
     // log
     implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.8.+'
     implementation group: 'org.slf4j', name: 'log4j-over-slf4j', version: '1.8.+'
 
     // utils
     implementation group: 'org.codehaus.httpcache4j.uribuilder', name: 'uribuilder', version: '2.0.0'
+    implementation 'com.google.guava:guava:30.1.1-jre'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.3'
+
+    // avro
+    implementation 'org.apache.avro:avro:1.10.2'
+
 
     // protobuf
-    implementation group: "com.google.protobuf", name: "protobuf-java", version: "3.13.0"
-    implementation group: "com.google.protobuf", name: "protobuf-java-util", version: "3.13.0"
+    implementation group: "com.google.protobuf", name: "protobuf-java", version: "3.15.8"
+    implementation group: "com.google.protobuf", name: "protobuf-java-util", version: "3.15.8"
 
     // Password hashing
     implementation group: "org.mindrot", name: "jbcrypt", version: "0.4"
 
-    // api
 
     // client
     implementation project(":client")
+}
+
+/**********************************************************************************************************************\
+ * Test
+ **********************************************************************************************************************/
+test {
+    useJUnitPlatform()
+
+    testLogging {
+        exceptionFormat = 'full'
+    }
+
+    retry {
+        maxRetries = 5
+        maxFailures = 15
+    }
+}
+
+dependencies {
+    testImplementation 'ch.qos.logback:logback-classic:1.3.0-alpha5'
 
     // micronaut test
     testAnnotationProcessor "org.projectlombok:lombok:" + lombokVersion
@@ -138,9 +142,9 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
     // test
-    testImplementation "org.apache.kafka:kafka_2.12:" + kafkaVersion
-    // force jackson version compatible with kafka
-
+    testImplementation "org.apache.kafka:kafka-clients:" + kafkaVersion + ":test"
+    testImplementation "org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion
+    testImplementation "org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion + ":test"
     testImplementation "io.confluent:kafka-schema-registry:" + confluentVersion
     testImplementation "io.confluent:kafka-schema-registry:" + confluentVersion + ":tests"
     testImplementation "org.apache.kafka:connect-runtime:" + kafkaVersion
@@ -152,33 +156,12 @@ dependencies {
     testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.14'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    implementation 'org.apache.avro:avro:1.10.0'
-    implementation 'org.sourcelab:kafka-connect-client:3.1.0'
-    implementation 'com.google.guava:guava:29.0-jre'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.2'
-    testImplementation 'org.mockito:mockito-junit-jupiter:3.5.7'
+    testImplementation 'org.mockito:mockito-junit-jupiter:3.9.0'
     testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.2'
-    testImplementation 'com.fasterxml.jackson.core:jackson-core:2.11.2'
-    testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.11.2'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.11.2'
-    testImplementation 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.13'
-}
-
-/**********************************************************************************************************************\
- * Test
- **********************************************************************************************************************/
-test {
-    useJUnitPlatform()
-
-    testLogging {
-        exceptionFormat = 'full'
-    }
-
-    retry {
-        maxRetries = 5
-        maxFailures = 15
-    }
+    testImplementation 'com.fasterxml.jackson.core:jackson-core:2.12.3'
+    testImplementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.3'
+    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
+    testImplementation 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.11'
 }
 
 testlogger {

client/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.siouan.frontend-jdk11' version '4.0.1'
+    id 'org.siouan.frontend-jdk11' version '5.1.0'
 }
 
 repositories {

gradle.properties

@@ -1,4 +1,5 @@
-micronautVersion=2.1.3
-confluentVersion=5.5.1
-kafkaVersion=2.6.0
-lombokVersion=1.18.16
+micronautVersion=2.5.0
+confluentVersion=6.1.1
+kafkaVersion=2.8.0
+kafkaScalaVersion=2.13
+lombokVersion=1.18.20

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,15 +1,10 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        jcenter()
-        maven {
-            name "JCenter Gradle Plugins"
-            url  "https://dl.bintray.com/gradle/gradle-plugins"
-        }
+        mavenCentral()
     }
 }
 
-
 rootProject.name = 'akhq'
 
 include 'client'

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

@@ -2,6 +2,7 @@
 
 import com.google.common.io.CharStreams;
 import io.micronaut.context.annotation.Value;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.async.publisher.Publishers;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -19,15 +20,13 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Objects;
-import javax.annotation.Nullable;
 
 @Filter("/ui/**")
 public class StaticFilter implements HttpServerFilter {
     @Nullable
     @Value("${micronaut.server.context-path}")
     protected String basePath;
 
-    @SuppressWarnings("deprecation")
     @Override
     public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
         return Publishers

src/main/java/org/akhq/modules/BasicAuthAuthenticationProvider.java

@@ -1,6 +1,6 @@
 package org.akhq.modules;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.security.authentication.*;
 import io.reactivex.Flowable;

src/main/java/org/akhq/modules/OidcUserDetailsMapper.java

@@ -2,19 +2,21 @@
 
 import io.micronaut.context.annotation.Replaces;
 import io.micronaut.context.annotation.Requires;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.security.authentication.UserDetails;
 import io.micronaut.security.config.AuthenticationModeConfiguration;
 import io.micronaut.security.oauth2.configuration.OpenIdAdditionalClaimsConfiguration;
-import io.micronaut.security.oauth2.endpoint.token.response.*;
+import io.micronaut.security.oauth2.endpoint.token.response.DefaultOpenIdUserDetailsMapper;
+import io.micronaut.security.oauth2.endpoint.token.response.OpenIdClaims;
+import io.micronaut.security.oauth2.endpoint.token.response.OpenIdTokenResponse;
 import org.akhq.configs.Oidc;
 import org.akhq.utils.UserGroupUtils;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.*;
 import java.util.stream.Collectors;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
 /**
  * An OpenID user details mapper that is configurable in the akhq config.
@@ -121,7 +123,7 @@ protected Set<String> getOidcGroups(Oidc.Provider provider, OpenIdClaims openIdC
      * @param openIdClaims  The OpenID claims
      * @return A user details object
      */
-    @Nonnull
+    @NonNull
     @Override
     public UserDetails createUserDetails(String providerName, OpenIdTokenResponse tokenResponse, OpenIdClaims openIdClaims) {
         String username = getUsername(providerName, tokenResponse, openIdClaims);

src/main/java/org/akhq/modules/SecuredAnnotationRuleWithDefault.java

@@ -1,7 +1,7 @@
 package org.akhq.modules;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
 import io.micronaut.context.annotation.Replaces;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.security.rules.SecuredAnnotationRule;
 import io.micronaut.security.rules.SecurityRule;

src/main/java/org/akhq/repositories/ConfigRepository.java

@@ -5,7 +5,6 @@
 import org.akhq.modules.AbstractKafkaWrapper;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.apache.kafka.common.config.ConfigResource;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.*;
 import java.util.concurrent.ExecutionException;
@@ -87,7 +86,7 @@ private void update(String clusterId, ConfigResource.Type type, String name, Lis
     }
 
     public static List<Config> updatedConfigs(Map<String, String> request, List<Config> configs, boolean html) {
-        Function<Config, @Nullable String> configFn = html ?
+        Function<Config, String> configFn = html ?
             (Config config) -> "configs[" + config.getName() + "]" :
             Config::getName;
 

src/main/java/org/akhq/repositories/SchemaRegistryRepository.java

@@ -150,13 +150,13 @@ public Schema lookUpSubjectVersion(String clusterId, String subject, org.apache.
         return new Schema(find, parsedSchema, this.getConfig(clusterId, subject));
     }
 
-    public boolean testCompatibility(String clusterId, String subject, org.apache.avro.Schema schema) throws IOException, RestClientException {
+    public List<String> testCompatibility(String clusterId, String subject, org.apache.avro.Schema schema) throws IOException, RestClientException {
         return this.kafkaModule
             .getRegistryRestClient(clusterId)
             .testCompatibility(schema.toString(), subject, "latest");
     }
 
-    public boolean testCompatibility(String clusterId, String subject, org.apache.avro.Schema schema, int version) throws IOException, RestClientException {
+    public List<String> testCompatibility(String clusterId, String subject, org.apache.avro.Schema schema, int version) throws IOException, RestClientException {
         return this.kafkaModule
             .getRegistryRestClient(clusterId)
             .testCompatibility(schema.toString(), subject, String.valueOf(version));