feat : upgrade to spring boot 3.3.0-RC1 and polish (#480)

* feat : upgrade to spring boot 3.3.0-RC1 and polish * revert change * Apply suggestions from code review Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
rajadilipkolli · Apr 21, 2024 · c27ddf3 · c27ddf3
1 parent da7d6e9
commit c27ddf3
Show file tree

Hide file tree

Showing 26 changed files with 141 additions and 49 deletions.
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -3,7 +3,7 @@ FROM gitpod/workspace-full
 USER root
 
 RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
- && sdk install java 21.0.2-graalce \
- && sdk default java 21.0.2-graalce"
+ && sdk install java 21.0.3-graalce \
+ && sdk default java 21.0.3-graalce"
 
 
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -9,10 +9,10 @@ image:
 vscode:
  extensions:
  - vscjava.vscode-java-pack
- - Vmware.vscode-boot-dev-pack
  - GabrielBB.vscode-lombok
  - ms-azuretools.vscode-docker
  - redhat.java
+ - Pivotal.vscode-boot-dev-pack
 
 ports:
  - port: 5050
@@ -34,3 +34,5 @@ ports:
  - port: 9411
  visibility: public
  onOpen: open-browser
+: public
+ onOpen: open-browser
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -96,6 +96,16 @@
  "projectName": "spring-boot-multiple-producers-consumers",
  "args": "",
  "envFile": "${workspaceFolder}/.env"
+ },
+ {
+ "type": "java",
+ "name": "Spring Boot-TestCloudKafkaSampleApplication<kafka-spring-cloud-sample>",
+ "request": "launch",
+ "cwd": "${workspaceFolder}",
+ "mainClass": "com.example.cloudkafkasample.TestCloudKafkaSampleApplication",
+ "projectName": "kafka-spring-cloud-sample",
+ "args": "",
+ "envFile": "${workspaceFolder}/.env"
  }
  ]
 }
diff --git a/README.md b/README.md
@@ -14,25 +14,23 @@ Kafka has a number of key features that make it a popular choice for data proces
 
  - **Low latency**: Kafka is designed for low-latency processing, making it suitable for real-time applications.
 
- - **High-throughput**: Kafka is able to handle high-throughput data streams, allowing it to process large amounts of data in real-time.
+ - **High-throughput**: Kafka can handle high-throughput data streams, allowing it to process large amounts of data in real-time.
 
  - **Flexibility**: Kafka is highly flexible and can be used for a wide range of data processing use cases, including real-time analytics, data pipelines, and event-driven architectures.
 
-This repository contains sample projects integrating with kafka using different mechanisms available
+This repository contains sample projects integrating with Kafka using different mechanisms available
 
- - [avro](./kafka-avro/README.md)
+ - [Kafka Avro type](./kafka-avro/README.md)
  - [DSL integration](./kafka-dsl-integration/ReadMe.md)
  - [reactor](./kafka-reactor/README.md)
- - [sample](./kafka-sample)
+ - [sample](./kafka-sample/README.md)
  - [Examples using spring boot](./kafka-spring-boot/README.md)
- - [kafka streams implementation](./kafka-streams/README.md)
- - [Kafka implementation using cloud bindings](./spring-cloud/README.md)
+ - [Kafka implementation using cloud bindings](./kafka-spring-cloud-sample/README.md)
+ - [Kafka streams implementation](./kafka-streams/README.md)
  - [Outbox Pattern Implementation using Modulith](./spring-modulith-outbox-pattern/README.md)
 
 
-
-
-### Reference
+## Reference
 
 Copied and modified from 
  - [sivalabs](https://github.com/sivaprasadreddy/kafka-tutorial)
diff --git a/kafka-avro/spring-boot-kafka-avro-consumer/pom.xml b/kafka-avro/spring-boot-kafka-avro-consumer/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath /> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example</groupId>
@@ -158,7 +158,7 @@
  <configuration>
  <java>
  <googleJavaFormat>
- <version>1.18.1</version>
+ <version>1.19.2</version>
  <style>AOSP</style>
  </googleJavaFormat>
  </java>

diff --git a/...est/java/com/example/springbootkafkaavro/SpringBootKafkaAvroConsumerApplicationTests.java b/...est/java/com/example/springbootkafkaavro/SpringBootKafkaAvroConsumerApplicationTests.java
@@ -35,7 +35,7 @@ class SpringBootKafkaAvroConsumerApplicationTests {
  @Autowired KafkaProducer kafkaProducer;
 
  private static final Network KAFKA_NETWORK = Network.newNetwork();
- private static final String CONFLUENT_PLATFORM_VERSION = "7.6.0";
+ private static final String CONFLUENT_PLATFORM_VERSION = "7.6.1";
  private static final DockerImageName KAFKA_IMAGE =
  DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION);
  private static final KafkaContainer KAFKA =

diff --git a/kafka-avro/spring-boot-kafka-avro-producer/pom.xml b/kafka-avro/spring-boot-kafka-avro-producer/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath /> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example</groupId>
@@ -154,7 +154,7 @@
  <configuration>
  <java>
  <googleJavaFormat>
- <version>1.18.1</version>
+ <version>1.19.2</version>
  <style>AOSP</style>
  </googleJavaFormat>
  </java>

diff --git a/...test/java/com/example/springbootkafkaavro/TestSpringBootKafkaAvroProducerApplication.java b/...test/java/com/example/springbootkafkaavro/TestSpringBootKafkaAvroProducerApplication.java
@@ -60,7 +60,7 @@ public Statement apply(Statement base, Description description) {
  @Bean
  @ServiceConnection
  KafkaContainer kafkaContainer() {
- return new KafkaRaftWithExtraListenersContainer("confluentinc/cp-kafka:7.6.0")
+ return new KafkaRaftWithExtraListenersContainer("confluentinc/cp-kafka:7.6.1")
  .withAdditionalListener(() -> "kafka:19092")
  .withKraft()
  .withNetwork(network)
@@ -72,7 +72,7 @@ KafkaContainer kafkaContainer() {
  @DependsOn("kafkaContainer")
  GenericContainer<?> schemaregistry(DynamicPropertyRegistry dynamicPropertyRegistry) {
  GenericContainer<?> schemaRegistry =
- new GenericContainer<>("confluentinc/cp-schema-registry:7.6.0")
+ new GenericContainer<>("confluentinc/cp-schema-registry:7.6.1")
  .withExposedPorts(8085)
  .withNetworkAliases("schemaregistry")
  .withNetwork(network)

diff --git a/kafka-dsl-integration/pom.xml b/kafka-dsl-integration/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath/> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example.integration</groupId>
@@ -84,7 +84,7 @@
  <configuration>
  <java>
  <palantirJavaFormat>
- <version>2.40.0</version>
+ <version>2.42.0</version>
  </palantirJavaFormat>
  <importOrder />
  <removeUnusedImports />
@@ -103,4 +103,25 @@
  </plugins>
  </build>
 
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
 </project>
diff --git a/...l-integration/src/test/java/com/example/integration/kafkadsl/TestKafkaDslApplication.java b/...l-integration/src/test/java/com/example/integration/kafkadsl/TestKafkaDslApplication.java
@@ -15,7 +15,7 @@ public class TestKafkaDslApplication {
  @ServiceConnection
  KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
  KafkaContainer kafkaContainer = new KafkaContainer(
- DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+ DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1"))
  .withKraft();
  // Connect our Spring application to our Testcontainers Kafka instance
  dynamicPropertyRegistry.add("spring.kafka.bootstrap-servers", kafkaContainer::getBootstrapServers);

diff --git a/kafka-reactor/boot-kafka-reactor-consumer/pom.xml b/kafka-reactor/boot-kafka-reactor-consumer/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath/> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example.boot.kafka.reactor</groupId>
@@ -143,7 +143,7 @@
  <configuration>
  <java>
  <palantirJavaFormat>
- <version>2.40.0</version>
+ <version>2.42.0</version>
  </palantirJavaFormat>
  <importOrder/>
  <removeUnusedImports/>
@@ -162,4 +162,25 @@
  </plugins>
  </build>
 
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
 </project>
diff --git a/...src/test/java/com/example/boot/kafka/reactor/TestBootKafkaReactorConsumerApplication.java b/...src/test/java/com/example/boot/kafka/reactor/TestBootKafkaReactorConsumerApplication.java
@@ -29,7 +29,7 @@ PostgreSQLContainer<?> postgresContainer() {
  @ServiceConnection
  KafkaContainer kafkaContainer(DynamicPropertyRegistry propertyRegistry) {
  KafkaContainer kafkaContainer = new KafkaContainer(
- DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+ DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1"))
  .withKraft();
  propertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
  return kafkaContainer;

diff --git a/kafka-reactor/boot-kafka-reactor-producer/pom.xml b/kafka-reactor/boot-kafka-reactor-producer/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath/> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example.boot.kafka.reactor</groupId>
@@ -105,7 +105,7 @@
  <configuration>
  <java>
  <palantirJavaFormat>
- <version>2.40.0</version>
+ <version>2.42.0</version>
  </palantirJavaFormat>
  <importOrder/>
  <removeUnusedImports/>

diff --git a/...src/test/java/com/example/boot/kafka/reactor/TestBootKafkaReactorProducerApplication.java b/...src/test/java/com/example/boot/kafka/reactor/TestBootKafkaReactorProducerApplication.java
@@ -24,7 +24,7 @@ public class TestBootKafkaReactorProducerApplication {
  @ServiceConnection
  KafkaContainer kafkaContainer(DynamicPropertyRegistry propertyRegistry) {
  KafkaContainer kafkaContainer = new KafkaContainer(
- DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+ DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1"))
  .withKraft();
  propertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
  return kafkaContainer;

diff --git a/kafka-spring-boot/README.md b/kafka-spring-boot/README.md
@@ -5,5 +5,5 @@ This folder contains sample kafka producer and consumer using java, spring & Spr
 
 | Type | Description |
 |------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------|
-| [Spring Boot Kafka Sample](./boot-kafka-sample)  | Producing and consuming Messages using Spring Boot |
+| [Spring Boot Kafka Sample](./boot-kafka-sample) | Producing and consuming Messages using Spring Boot |
 | [Multiple Producers & Consumers](./spring-boot-multiple-producers-consumers) | Producing and consuming Messages from Multiple Producer and consumers using Spring Boot |
diff --git a/kafka-spring-boot/boot-kafka-sample/pom.xml b/kafka-spring-boot/boot-kafka-sample/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath/> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example</groupId>

diff --git a/...ample/src/test/java/com/example/springbootkafkasample/TestBootKafkaSampleApplication.java b/...ample/src/test/java/com/example/springbootkafkasample/TestBootKafkaSampleApplication.java
@@ -14,7 +14,7 @@ public class TestBootKafkaSampleApplication {
  @ServiceConnection
  KafkaContainer kafkaContainer() {
  KafkaContainer kafkaContainer = new KafkaContainer(
- DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+ DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1"))
  .withKraft();
  kafkaContainer.addEnv("KAFKA_NUM_PARTITIONS", "32");
  return kafkaContainer;

diff --git a/kafka-spring-boot/spring-boot-multiple-producers-consumers/pom.xml b/kafka-spring-boot/spring-boot-multiple-producers-consumers/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath/> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example.kafka</groupId>
@@ -166,4 +166,25 @@
  </plugins>
  </build>
 
+ <repositories>
+ <repository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>spring-milestones</id>
+ <name>Spring Milestones</name>
+ <url>https://repo.spring.io/milestone</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
 </project>
diff --git a/.../src/test/java/com/example/springbootkafka/multi/TestSpringBootKafkaMultiApplication.java b/.../src/test/java/com/example/springbootkafka/multi/TestSpringBootKafkaMultiApplication.java
@@ -22,7 +22,7 @@ GenericContainer<?> zipkinContainer() {
  @ServiceConnection
  KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
  KafkaContainer kafkaContainer = new KafkaContainer(
- DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+ DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1"))
  .withKraft()
  .withReuse(true);
  // Connect our Spring application to our Testcontainers Kafka instance

diff --git a/kafka-spring-cloud-sample/pom.xml b/kafka-spring-cloud-sample/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath/> <!-- lookup parent from repository -->
  </parent>
  <groupId>com.example</groupId>

diff --git a/...ud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java b/...ud-sample/src/test/java/com/example/cloudkafkasample/TestCloudKafkaSampleApplication.java
@@ -16,7 +16,7 @@ class TestCloudKafkaSampleApplication {
  @ServiceConnection
  KafkaContainer kafkaContainer(DynamicPropertyRegistry dynamicPropertyRegistry) {
  KafkaContainer kafkaContainer = new KafkaContainer(
- DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+ DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1"))
  .withKraft()
  .withReuse(true);
  dynamicPropertyRegistry.add("spring.cloud.stream.kafka.binder.brokers", kafkaContainer::getBootstrapServers);

diff --git a/...-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java b/...-kafka-consumer/src/test/java/com/example/analytics/TestAnalyticsConsumerApplication.java
@@ -13,7 +13,7 @@
 public class TestAnalyticsConsumerApplication {
 
  private static final DockerImageName KAFKA_IMAGE_NAME =
- DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0");
+ DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1");
 
  @Bean
  @ServiceConnection

diff --git a/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml b/kafka-streams/analytics-spring-cloud-streams-kafka-producer/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.2.5</version>
+ <version>3.3.0-RC1</version>
  <relativePath /> <!-- lookup parent from repository -->
  </parent>
 

diff --git a/...-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java b/...-kafka-producer/src/test/java/com/example/analytics/TestAnalyticsProducerApplication.java
@@ -16,7 +16,7 @@ class TestAnalyticsProducerApplication {
  @ServiceConnection
  KafkaContainer kafkaContainer(DynamicPropertyRegistry propertyRegistry) {
  KafkaContainer kafkaContainer =
- new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.0"))
+ new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka").withTag("7.6.1"))
  .withKraft();
  propertyRegistry.add("spring.kafka.bootstrapServers", kafkaContainer::getBootstrapServers);
  return kafkaContainer;