Add Support for Micronaut 3.0

build.gradle

@@ -15,6 +15,7 @@ subprojects { Project subproject ->
         return
     }
 
+
     group "io.micronaut.kafka"
 
     apply plugin: "io.micronaut.build.internal.common"

gradle.properties

@@ -1,7 +1,7 @@
-projectVersion=3.3.4-SNAPSHOT
+projectVersion=4.0.0-SNAPSHOT
 micronautDocsVersion=2.0.0.RC1
 micronautBuildVersion=1.1.5
-micronautVersion=2.4.2
+micronautVersion=2.5.7
 micronautGradlePluginVersion=1.5.0
 groovyVersion=3.0.5
 spockVersion=2.0-M3-groovy-3.0
@@ -15,7 +15,7 @@ githubSlug=micronaut-projects/micronaut-kafka
 developers=Graeme Rocher
 
 githubBranch=master
-githubCoreBranch=2.5.x
+githubCoreBranch=3.0.x
 bomProperty=micronautKafkaVersion
 bomProperties=kafkaVersion
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

kafka-streams/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     api project(":kafka")
     api "io.micronaut:micronaut-messaging:$micronautVersion"
     api "org.apache.kafka:kafka-streams:${kafkaVersion}"
-
+    implementation 'jakarta.inject:jakarta.inject-api:2.0.0'
     compileOnly "io.micronaut:micronaut-management"
 
     testAnnotationProcessor "io.micronaut:micronaut-inject-java"
@@ -15,7 +15,7 @@ dependencies {
     testImplementation "io.micronaut:micronaut-inject-java"
     testImplementation "io.micronaut:micronaut-inject"
     testImplementation "io.micronaut.micrometer:micronaut-micrometer-core"
-    testImplementation "io.projectreactor:reactor-core:3.4.6"
+    testImplementation "io.projectreactor:reactor-core:3.4.7"
     testImplementation "io.micronaut:micronaut-management"
     testImplementation "org.apache.kafka:kafka-clients:${kafkaVersion}:test"
     testImplementation "org.apache.kafka:kafka_2.12:${kafkaVersion}"

kafka-streams/src/main/java/io/micronaut/configuration/kafka/streams/DefaultKafkaStreamsConfiguration.java

@@ -21,8 +21,8 @@
 import io.micronaut.context.env.Environment;
 import io.micronaut.runtime.ApplicationConfiguration;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.Properties;
 
 /**

kafka-streams/src/main/java/io/micronaut/configuration/kafka/streams/KafkaStreamsFactory.java

@@ -29,7 +29,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.io.Closeable;
 import java.time.Duration;
 import java.util.Map;

kafka-streams/src/main/java/io/micronaut/configuration/kafka/streams/health/KafkaStreamsHealth.java

@@ -31,7 +31,7 @@
 import org.apache.kafka.streams.processor.ThreadMetadata;
 import org.reactivestreams.Publisher;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;

kafka-streams/src/test/groovy/io/micronaut/configuration/kafka/streams/listeners/BeforeStartKafkaStreamsListenerImp.java

@@ -3,7 +3,7 @@
 import io.micronaut.configuration.kafka.streams.event.BeforeKafkaStreamStart;
 import io.micronaut.runtime.event.annotation.EventListener;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class BeforeStartKafkaStreamsListenerImp {

kafka-streams/src/test/groovy/io/micronaut/configuration/kafka/streams/optimization/OptimizationInteractiveQueryService.java

@@ -4,7 +4,7 @@
 import org.apache.kafka.streams.state.QueryableStoreTypes;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Optional;
 
 @Singleton

kafka-streams/src/test/groovy/io/micronaut/configuration/kafka/streams/optimization/OptimizationStream.java

@@ -9,8 +9,8 @@
 import org.apache.kafka.streams.kstream.KTable;
 import org.apache.kafka.streams.kstream.Materialized;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.Properties;
 
 @Factory

kafka-streams/src/test/groovy/io/micronaut/configuration/kafka/streams/wordcount/InteractiveQueryServiceExample.java

@@ -4,7 +4,7 @@
 import org.apache.kafka.streams.state.QueryableStoreTypes;
 import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.Optional;
 
 /**

kafka-streams/src/test/groovy/io/micronaut/configuration/kafka/streams/wordcount/WordCountStream.java

@@ -12,8 +12,8 @@
 import org.apache.kafka.streams.kstream.Materialized;
 import org.apache.kafka.streams.kstream.Produced;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Properties;

kafka/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     compileOnly 'io.zipkin.brave:brave-instrumentation-kafka-clients:5.13.3'
     api "io.micronaut:micronaut-messaging:$micronautVersion"
     api "org.apache.kafka:kafka-clients:${kafkaVersion}"
-
+    implementation 'jakarta.inject:jakarta.inject-api:2.0.0'
     compileOnly "io.micronaut:micronaut-management"
     compileOnly "io.micronaut.micrometer:micronaut-micrometer-core"
     compileOnly "org.apache.kafka:kafka_2.12:${kafkaVersion}"
@@ -18,7 +18,7 @@ dependencies {
     testImplementation "io.micronaut.test:micronaut-test-spock"
     testImplementation "io.micronaut:micronaut-inject-java"
     testImplementation "io.micronaut.micrometer:micronaut-micrometer-core"
-    testImplementation "io.projectreactor:reactor-core:3.4.6"
+    testImplementation "io.projectreactor:reactor-core:3.4.7"
     testImplementation "io.micronaut:micronaut-management"
     testImplementation "io.micronaut:micronaut-http-client"
     testImplementation "io.micronaut:micronaut-inject-groovy"

kafka/src/main/java/io/micronaut/configuration/kafka/KafkaAcknowledgement.java

@@ -23,7 +23,7 @@
  * @author James Kleeh
  * @since 1.1.0
  */
-public interface KafkaAcknowledgement extends Acknowledgement, io.micronaut.configuration.kafka.Acknowledgement {
+public interface KafkaAcknowledgement extends Acknowledgement {
 
     /**
      * Kafka does not support rejection of messages explicitly.

kafka/src/main/java/io/micronaut/configuration/kafka/KafkaConsumerFactory.java

@@ -22,6 +22,7 @@
 import io.micronaut.context.annotation.Prototype;
 import io.micronaut.context.exceptions.ConfigurationException;
 import io.micronaut.core.annotation.TypeHint;
+import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.consumer.RangeAssignor;
 import org.apache.kafka.clients.consumer.RoundRobinAssignor;
@@ -81,7 +82,7 @@ public class KafkaConsumerFactory {
      * @return The consumer
      */
     @Prototype
-    public <K, V> KafkaConsumer<K, V> createConsumer(
+    public <K, V> Consumer<K, V> createConsumer(
             @Parameter AbstractKafkaConsumerConfiguration<K, V> consumerConfiguration) {
 
         Optional<Deserializer<K>> keyDeserializer = consumerConfiguration.getKeyDeserializer();