From: Kai Moritz <kai@juplo.de>
Date: Sat, 23 Jul 2022 08:40:57 +0000 (+0200)
Subject: Merge der Upgrades für Confluent/Spring-Boot (Branch 'first-contact')
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=ed2942b74c61f6e0a99747c87813900ed666f860;hp=-c;p=demos%2Fkafka%2Ftraining

Merge der Upgrades für Confluent/Spring-Boot (Branch 'first-contact')
---

ed2942b74c61f6e0a99747c87813900ed666f860
diff --combined docker-compose.yml
index d715e66,ec307f5..023bfdd
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -1,14 -1,14 +1,14 @@@
  version: '3.2'
  services:
    zookeeper:
-     image: confluentinc/cp-zookeeper:6.2.0
+     image: confluentinc/cp-zookeeper:7.1.3
      environment:
        ZOOKEEPER_CLIENT_PORT: 2181
      ports:
        - 2181:2181
  
    kafka:
-     image: confluentinc/cp-kafka:6.2.0
+     image: confluentinc/cp-kafka:7.1.3
      environment:
        KAFKA_BROKER_ID: 1
        KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
@@@ -24,35 -24,14 +24,35 @@@
      depends_on:
        - zookeeper
  
 -  setup:
 -    image: juplo/toolbox
 -    command: >
 -      bash -c "
 -        kafka-topics --bootstrap-server kafka:9092 --delete --if-exists --topic test
 -        kafka-topics --bootstrap-server kafka:9092 --create --topic test --partitions 2
 -      "
 +  kafka-ui:
 +    image: provectuslabs/kafka-ui:0.3.3
 +    ports:
 +      - 8080:8080
 +    environment:
 +      KAFKA_CLUSTERS_0_NAME: local
 +      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:9092
  
    cli:
      image: juplo/toolbox
      command: sleep infinity
 +
 +  producer:
 +    image: juplo/endless-producer:1.0-SNAPSHOT
 +    ports:
 +      - 8000:8080
 +    environment:
 +      producer.bootstrap-server: kafka:9092
 +      producer.client-id: producer
 +      producer.topic: test
 +      producer.throttle-ms: 10
 +
 +
 +  consumer:
 +    image: juplo/counting-consumer:1.0-SNAPSHOT
 +    ports:
 +      - 8081:8081
 +    environment:
 +      consumer.bootstrap-server: kafka:9092
 +      consumer.client-id: my-group
 +      consumer.client-id: consumer
 +      consumer.topic: test
diff --combined pom.xml
index 267e035,70f37e8..e7ad998
--- a/pom.xml
+++ b/pom.xml
@@@ -7,29 -7,16 +7,29 @@@
    <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
-     <version>2.6.5</version>
+     <version>2.7.2</version>
      <relativePath/> <!-- lookup parent from repository -->
    </parent>
  
    <groupId>de.juplo.kafka</groupId>
 -  <artifactId>first-contact</artifactId>
 -  <name>First Contact: a Simple Producer and a simple Consumer-Group</name>
 +  <artifactId>endless-producer</artifactId>
 +  <name>Endless Producer: a Simple Producer that endlessly writes numbers into a topic</name>
    <version>1.0-SNAPSHOT</version>
  
    <dependencies>
 +    <dependency>
 +      <groupId>org.springframework.boot</groupId>
 +      <artifactId>spring-boot-starter-web</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework.boot</groupId>
 +      <artifactId>spring-boot-starter-actuator</artifactId>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework.boot</groupId>
 +      <artifactId>spring-boot-configuration-processor</artifactId>
 +      <optional>true</optional>
 +    </dependency>
      <dependency>
        <groupId>org.apache.kafka</groupId>
        <artifactId>kafka-clients</artifactId>
@@@ -39,36 -26,29 +39,36 @@@
        <artifactId>lombok</artifactId>
      </dependency>
      <dependency>
 -      <groupId>ch.qos.logback</groupId>
 -      <artifactId>logback-classic</artifactId>
 +      <groupId>org.springframework.boot</groupId>
 +      <artifactId>spring-boot-starter-test</artifactId>
 +      <scope>test</scope>
      </dependency>
    </dependencies>
  
    <build>
      <plugins>
        <plugin>
 -        <groupId>org.codehaus.mojo</groupId>
 -        <artifactId>exec-maven-plugin</artifactId>
 -        <version>3.0.0</version>
 +        <groupId>org.springframework.boot</groupId>
 +        <artifactId>spring-boot-maven-plugin</artifactId>
 +      </plugin>
 +      <plugin>
 +        <groupId>io.fabric8</groupId>
 +        <artifactId>docker-maven-plugin</artifactId>
 +        <version>0.33.0</version>
 +        <configuration>
 +          <images>
 +            <image>
 +              <name>juplo/%a:%v</name>
 +            </image>
 +          </images>
 +        </configuration>
          <executions>
            <execution>
 -            <id>producer</id>
 -            <configuration>
 -              <mainClass>de.juplo.kafka.SimpleProducer</mainClass>
 -            </configuration>
 -          </execution>
 -          <execution>
 -            <id>consumer</id>
 -            <configuration>
 -              <mainClass>de.juplo.kafka.SimpleConsumer</mainClass>
 -            </configuration>
 +             <id>build</id>
 +             <phase>package</phase>
 +             <goals>
 +               <goal>build</goal>
 +             </goals>
            </execution>
          </executions>
        </plugin>