From: Kai Moritz <kai@juplo.de>
Date: Fri, 22 Jul 2022 18:57:49 +0000 (+0200)
Subject: Merge der Upgrades für Confluent/Spring-Boot (Branch 'rest-producer')
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=dcd9037cade37c58bf38536b01beb8f69a7a6a12;hp=-c;p=demos%2Fkafka%2Ftraining

Merge der Upgrades für Confluent/Spring-Boot (Branch 'rest-producer')
---

dcd9037cade37c58bf38536b01beb8f69a7a6a12
diff --combined docker-compose.yml
index 5baa959,1e8a8df..7321516
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -1,14 -1,14 +1,14 @@@
  version: '3.2'
  services:
    zookeeper:
-     image: confluentinc/cp-zookeeper:7.0.2
+     image: confluentinc/cp-zookeeper:7.1.3
      environment:
        ZOOKEEPER_CLIENT_PORT: 2181
      ports:
        - 2181:2181
  
    kafka:
-     image: confluentinc/cp-kafka:7.0.2
+     image: confluentinc/cp-kafka:7.1.3
      environment:
        KAFKA_BROKER_ID: 1
        KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
@@@ -37,13 -37,13 +37,13 @@@
      command: sleep infinity
  
    producer:
 -    image: juplo/rest-producer:1.0-SNAPSHOT
 +    image: juplo/springified-producer:1.0-SNAPSHOT
      ports:
        - 8080:8880
      environment:
 -      producer.bootstrap-server: kafka:9092
 +      spring.kafka.bootstrap-servers: kafka:9092
        producer.client-id: producer
 -      producer.topic: test
 +      spring.kafka.template.default-topic: test
  
    consumer:
      image: juplo/endless-consumer:1.0-SNAPSHOT
diff --combined pom.xml
index c3e5cb9,e4d24bb..4c79bc8
--- a/pom.xml
+++ b/pom.xml
@@@ -7,14 -7,14 +7,14 @@@
    <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
-     <version>2.7.1</version>
+     <version>2.7.2</version>
      <relativePath/> <!-- lookup parent from repository -->
    </parent>
  
    <groupId>de.juplo.kafka</groupId>
 -  <artifactId>rest-producer</artifactId>
 -  <name>REST Producer</name>
 -  <description>A Simple Producer that takes messages via POST and confirms successs</description>
 +  <artifactId>springified-producer</artifactId>
 +  <name>Springified REST Producer</name>
 +  <description>A Simple Producer that is implemented with the help of Spring Kafka and takes messages via POST and confirms successs</description>
    <version>1.0-SNAPSHOT</version>
  
    <dependencies>
@@@ -32,8 -32,8 +32,8 @@@
        <optional>true</optional>
      </dependency>
      <dependency>
 -      <groupId>org.apache.kafka</groupId>
 -      <artifactId>kafka-clients</artifactId>
 +      <groupId>org.springframework.kafka</groupId>
 +      <artifactId>spring-kafka</artifactId>
      </dependency>
      <dependency>
        <groupId>org.projectlombok</groupId>
@@@ -44,6 -44,11 +44,6 @@@
        <artifactId>spring-boot-starter-test</artifactId>
        <scope>test</scope>
      </dependency>
 -    <dependency>
 -      <groupId>org.springframework.kafka</groupId>
 -      <artifactId>spring-kafka</artifactId>
 -      <scope>test</scope>
 -    </dependency>
      <dependency>
        <groupId>org.springframework.kafka</groupId>
        <artifactId>spring-kafka-test</artifactId>