Create spring-boot-kafka module

Author: wilkinsona

settings.gradle

@@ -60,6 +60,7 @@ include "spring-boot-project:spring-boot-jdbc"
 include "spring-boot-project:spring-boot-jetty"
 include "spring-boot-project:spring-boot-jms"
 include "spring-boot-project:spring-boot-jsonb"
+include "spring-boot-project:spring-boot-kafka"
 include "spring-boot-project:spring-boot-liquibase"
 include "spring-boot-project:spring-boot-mail"
 include "spring-boot-project:spring-boot-parent"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -26,6 +26,7 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-jdbc"))
 	optional(project(":spring-boot-project:spring-boot-jetty"))
 	optional(project(":spring-boot-project:spring-boot-jsonb"))
+	optional(project(":spring-boot-project:spring-boot-kafka"))
 	optional(project(":spring-boot-project:spring-boot-liquibase"))
 	optional(project(":spring-boot-project:spring-boot-mail"))
 	optional(project(":spring-boot-project:spring-boot-reactor-netty"))

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfiguration.java

@@ -23,10 +23,9 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.kafka.DefaultKafkaConsumerFactoryCustomizer;
-import org.springframework.boot.autoconfigure.kafka.DefaultKafkaProducerFactoryCustomizer;
-import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
-import org.springframework.boot.autoconfigure.kafka.StreamsBuilderFactoryBeanCustomizer;
+import org.springframework.boot.kafka.autoconfigure.DefaultKafkaConsumerFactoryCustomizer;
+import org.springframework.boot.kafka.autoconfigure.DefaultKafkaProducerFactoryCustomizer;
+import org.springframework.boot.kafka.autoconfigure.StreamsBuilderFactoryBeanCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.config.StreamsBuilderFactoryBean;
@@ -45,7 +44,7 @@
  * @author Eddú Meléndez
  * @since 2.1.0
  */
-@AutoConfiguration(before = KafkaAutoConfiguration.class,
+@AutoConfiguration(beforeName = "org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration",
 		after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
 @ConditionalOnClass({ KafkaClientMetrics.class, ProducerFactory.class })
 @ConditionalOnBean(MeterRegistry.class)

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java

@@ -26,7 +26,7 @@
 
 import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration;
+import org.springframework.boot.kafka.autoconfigure.KafkaAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -97,7 +97,6 @@ dependencies {
 	}
 	optional("org.apache.httpcomponents.client5:httpclient5")
 	optional("org.apache.httpcomponents.core5:httpcore5-reactive")
-	optional("org.apache.kafka:kafka-streams")
 	optional("org.apache.tomcat.embed:tomcat-embed-core")
 	optional("org.apache.tomcat.embed:tomcat-embed-el")
 	optional("org.apache.tomcat.embed:tomcat-embed-websocket")
@@ -221,7 +220,6 @@ dependencies {
 	optional("org.springframework.session:spring-session-jdbc")
 	optional("org.springframework.amqp:spring-rabbit")
 	optional("org.springframework.amqp:spring-rabbit-stream")
-	optional("org.springframework.kafka:spring-kafka")
 	optional("org.springframework.ws:spring-ws-core") {
 		exclude group: "com.sun.mail", module: "jakarta.mail"
 		exclude group: "jakarta.platform", module: "jakarta.jakartaee-api"
@@ -262,9 +260,6 @@ dependencies {
 	testImplementation("org.postgresql:postgresql")
 	testImplementation("org.postgresql:r2dbc-postgresql")
 	testImplementation("org.springframework.graphql:spring-graphql-test")
-	testImplementation("org.springframework.kafka:spring-kafka-test") {
-		exclude group: "commons-logging", module: "commons-logging"
-	}
 	testImplementation("org.springframework.pulsar:spring-pulsar-cache-provider-caffeine")
 	testImplementation("org.springframework.security:spring-security-test")
 	testImplementation("org.yaml:snakeyaml")

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1017,177 +1017,6 @@
         "reason": "Narayana support has moved to third party starter."
       }
     },
-    {
-      "name": "spring.kafka.admin.ssl.keystore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.admin.ssl.key-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.admin.ssl.keystore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.admin.ssl.key-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.admin.ssl.truststore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.admin.ssl.trust-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.admin.ssl.truststore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.admin.ssl.trust-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.consumer.ssl.keystore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.consumer.ssl.key-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.consumer.ssl.keystore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.consumer.ssl.key-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.consumer.ssl.truststore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.consumer.ssl.trust-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.consumer.ssl.truststore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.consumer.ssl.trust-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.listener.only-log-record-metadata",
-      "type": "java.lang.Boolean",
-      "defaultValue": true,
-      "description": "Whether to suppress the entire record from being written to the log when retries are being attempted.",
-      "deprecation": {
-        "reason": "Use KafkaUtils#setConsumerRecordFormatter instead.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.producer.ssl.keystore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.producer.ssl.key-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.producer.ssl.keystore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.producer.ssl.key-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.producer.ssl.truststore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.producer.ssl.trust-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.producer.ssl.truststore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.producer.ssl.trust-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.ssl.keystore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.ssl.key-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.ssl.keystore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the key store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.ssl.key-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.ssl.truststore-location",
-      "type": "org.springframework.core.io.Resource",
-      "description": "Location of the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.ssl.trust-store-location",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.ssl.truststore-password",
-      "type": "java.lang.String",
-      "description": "Store password for the trust store file.",
-      "deprecation": {
-        "replacement": "spring.kafka.ssl.trust-store-password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.streams.cache-max-bytes-buffering",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "replacement": "spring.kafka.streams.state-store-cache-max-size",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.kafka.streams.cache-max-size-buffering",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "replacement": "spring.kafka.streams.state-store-cache-max-size",
-        "level": "error",
-        "since": "3.1.0"
-      }
-    },
     {
       "name": "spring.mustache.prefix",
       "defaultValue": "classpath:/templates/"

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -55,7 +55,6 @@ org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration
 org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration
 org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration
 org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration
-org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration
 org.springframework.boot.autoconfigure.ldap.embedded.EmbeddedLdapAutoConfiguration
 org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration
 org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -2006,6 +2006,7 @@ bom {
 				"spring-boot-jetty",
 				"spring-boot-jms",
 				"spring-boot-jsonb",
+				"spring-boot-kafka",
 				"spring-boot-liquibase",
 				"spring-boot-loader",
 				"spring-boot-loader-classic",

spring-boot-project/spring-boot-docs/build.gradle

@@ -68,6 +68,7 @@ dependencies {
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-jetty", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-jms", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-jsonb", configuration: "autoConfigurationMetadata"))
+	autoConfiguration(project(path: ":spring-boot-project:spring-boot-kafka", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-liquibase", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-mail", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-reactor-netty", configuration: "autoConfigurationMetadata"))
@@ -94,6 +95,7 @@ dependencies {
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-jdbc", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-jetty", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-jms", configuration: "configurationPropertiesMetadata"))
+	configurationProperties(project(path: ":spring-boot-project:spring-boot-kafka", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-liquibase", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-mail", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-reactor-netty", configuration: "configurationPropertiesMetadata"))

spring-boot-project/spring-boot-kafka/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.auto-configuration"
+	id "org.springframework.boot.configuration-properties"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot Kafka"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot"))
+	api("org.springframework.kafka:spring-kafka")
+
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional("org.apache.kafka:kafka-streams")
+
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation("org.springframework.kafka:spring-kafka-test") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+}