Branches so umsortiert, das die Rebases in einer sinnvollen Reihenfolge erfolgen

diff --git a/BRANCHES.sh b/BRANCHES.sh
index cbfb15a..29437bf 100755 (executable)
--- a/BRANCHES.sh
+++ b/BRANCHES.sh
@@ -1,22 +1,16 @@
 #!/bin/bash
 set -e
 
-config__flawed_setup__zookeeper=config/flawed-setup--zookeeper
-config__flawed_setup__zookeeper__ROOT=grundlagen/docker
 grundlagen__docker=grundlagen/docker
 grundlagen__docker__ROOT=grundlagen/docker
+config__flawed_setup__zookeeper=config/flawed-setup--zookeeper
+config__flawed_setup__zookeeper__ROOT=grundlagen/docker
+producer__batch_size__vorlage=producer/batch-size--vorlage
+producer__batch_size__vorlage__ROOT=grundlagen/docker
 grundlagen__simple_producer=grundlagen/simple-producer
 grundlagen__simple_producer__ROOT=grundlagen/docker
 grundlagen__simple_producer__vorlage=grundlagen/simple-producer--vorlage
 grundlagen__simple_producer__vorlage__ROOT=grundlagen/simple-producer
-grundlagen__simple_consumer=grundlagen/simple-consumer
-grundlagen__simple_consumer__ROOT=grundlagen/simple-producer
-grundlagen__simple_consumer__vorlage=grundlagen/simple-consumer--vorlage
-grundlagen__simple_consumer__vorlage__ROOT=grundlagen/simple-consumer
-grundlagen__simple_consumer__consumergroup__vorlage=grundlagen/simple-consumer--consumergroup--vorlage
-grundlagen__simple_consumer__consumergroup__vorlage__ROOT=grundlagen/simple-consumer--vorlage
-producer__batch_size__vorlage=producer/batch-size--vorlage
-producer__batch_size__vorlage__ROOT=grundlagen/docker
 producer__spring_producer=producer/spring-producer
 producer__spring_producer__ROOT=grundlagen/simple-producer
 producer__spring_producer__vorlage=producer/spring-producer--vorlage
@@ -37,8 +31,36 @@ producer__spring_producer__auditheaders=producer/spring-producer--auditheaders
 producer__spring_producer__auditheaders__ROOT=producer/spring-producer--backpressure
 producer__spring_producer__auditheaders__vorlage=producer/spring-producer--auditheaders--vorlage
 producer__spring_producer__auditheaders__vorlage__ROOT=producer/spring-producer--auditheaders
+producer__spring_producer__long=producer/spring-producer--long
+producer__spring_producer__long__ROOT=producer/spring-producer
+producer__spring_producer__long__vorlage=producer/spring-producer--long--vorlage
+producer__spring_producer__long__vorlage__ROOT=producer/spring-producer--long
 producer__rest_producer=producer/rest-producer
 producer__rest_producer__ROOT=producer/spring-producer
+spring__spring_producer__json=spring/spring-producer--json
+spring__spring_producer__json__ROOT=producer/spring-producer
+spring__spring_producer__json__vorlage=spring/spring-producer--json--vorlage
+spring__spring_producer__json__vorlage__ROOT=spring/spring-producer--json
+spring__spring_producer__json__messages=spring/spring-producer--json--messages
+spring__spring_producer__json__messages__ROOT=spring/spring-producer--json
+spring__spring_producer__json__messages__vorlage=spring/spring-producer--json--messages--vorlage
+spring__spring_producer__json__messages__vorlage__ROOT=spring/spring-producer--json--messages
+spring__spring_producer__kafkatemplate=spring/spring-producer--kafkatemplate
+spring__spring_producer__kafkatemplate__ROOT=producer/spring-producer
+spring__spring_producer__kafkatemplate__vorlage=spring/spring-producer--kafkatemplate--vorlage
+spring__spring_producer__kafkatemplate__vorlage__ROOT=spring/spring-producer--kafkatemplate
+spring__technik_check__vorlage=spring/technik-check--vorlage
+spring__technik_check__vorlage__ROOT=spring/spring-producer--kafkatemplate
+spring__supersimple_producer=spring/supersimple-producer
+spring__supersimple_producer__ROOT=producer/spring-producer
+spring__supersimple_producer__vorlage=spring/supersimple-producer--vorlage
+spring__supersimple_producer__vorlage__ROOT=spring/supersimple-producer
+grundlagen__simple_consumer=grundlagen/simple-consumer
+grundlagen__simple_consumer__ROOT=grundlagen/simple-producer
+grundlagen__simple_consumer__vorlage=grundlagen/simple-consumer--vorlage
+grundlagen__simple_consumer__vorlage__ROOT=grundlagen/simple-consumer
+grundlagen__simple_consumer__consumergroup__vorlage=grundlagen/simple-consumer--consumergroup--vorlage
+grundlagen__simple_consumer__consumergroup__vorlage__ROOT=grundlagen/simple-consumer--vorlage
 consumer__simple_consumer__megagroup__vorlage=consumer/simple-consumer--megagroup--vorlage
 consumer__simple_consumer__megagroup__vorlage__ROOT=grundlagen/simple-consumer--consumergroup--vorlage
 consumer__simple_consumer__spickzettel__vorlage=consumer/simple-consumer--spickzettel--vorlage
@@ -61,10 +83,6 @@ consumer__spring_consumer__logic_error=consumer/spring-consumer--logic-error
 consumer__spring_consumer__logic_error__ROOT=consumer/spring-consumer
 consumer__spring_consumer__logic_error__vorlage=consumer/spring-consumer--logic-error--vorlage
 consumer__spring_consumer__logic_error__vorlage__ROOT=consumer/spring-consumer--logic-error
-producer__spring_producer__long=producer/spring-producer--long
-producer__spring_producer__long__ROOT=producer/spring-producer
-producer__spring_producer__long__vorlage=producer/spring-producer--long--vorlage
-producer__spring_producer__long__vorlage__ROOT=producer/spring-producer--long
 consumer__spring_consumer__long=consumer/spring-consumer--long
 consumer__spring_consumer__long__ROOT=consumer/spring-consumer
 consumer__spring_consumer__deserialization_error=consumer/spring-consumer--deserialization-error
@@ -81,46 +99,28 @@ consumer__spring_consumer__assign=consumer/spring-consumer--assign
 consumer__spring_consumer__assign__ROOT=consumer/spring-consumer
 consumer__spring_consumer__assign__vorlage=consumer/spring-consumer--assign--vorlage
 consumer__spring_consumer__assign__vorlage__ROOT=consumer/spring-consumer--assign
-spring__spring_producer__kafkatemplate=spring/spring-producer--kafkatemplate
-spring__spring_producer__kafkatemplate__ROOT=producer/spring-producer
-spring__spring_producer__kafkatemplate__vorlage=spring/spring-producer--kafkatemplate--vorlage
-spring__spring_producer__kafkatemplate__vorlage__ROOT=spring/spring-producer--kafkatemplate
-spring__technik_check__vorlage=spring/technik-check--vorlage
-spring__technik_check__vorlage__ROOT=spring/spring-producer--kafkatemplate
-spring__supersimple_producer=spring/supersimple-producer
-spring__supersimple_producer__ROOT=producer/spring-producer
-spring__supersimple_producer__vorlage=spring/supersimple-producer--vorlage
-spring__supersimple_producer__vorlage__ROOT=spring/supersimple-producer
-spring__supersimple_consumer=spring/supersimple-consumer
-spring__supersimple_consumer__ROOT=consumer/spring-consumer
-spring__supersimple_consumer__vorlage=spring/supersimple-consumer--vorlage
-spring__supersimple_consumer__vorlage__ROOT=spring/supersimple-consumer
-spring__spring_consumer__kafkalistener=spring/spring-consumer--kafkalistener
-spring__spring_consumer__kafkalistener__ROOT=consumer/spring-consumer
-spring__spring_consumer__kafkalistener__concurrency=spring/spring-consumer--kafkalistener--concurrency
-spring__spring_consumer__kafkalistener__concurrency__ROOT=spring/spring-consumer--kafkalistener
-spring__spring_producer__json=spring/spring-producer--json
-spring__spring_producer__json__ROOT=producer/spring-producer
-spring__spring_producer__json__vorlage=spring/spring-producer--json--vorlage
-spring__spring_producer__json__vorlage__ROOT=spring/spring-producer--json
 spring__spring_consumer__json=spring/spring-consumer--json
 spring__spring_consumer__json__ROOT=consumer/spring-consumer
 spring__spring_consumer__json__vorlage=spring/spring-consumer--json--vorlage
 spring__spring_consumer__json__vorlage__ROOT=spring/spring-consumer--json
-spring__spring_producer__json__messages=spring/spring-producer--json--messages
-spring__spring_producer__json__messages__ROOT=spring/spring-producer--json
-spring__spring_producer__json__messages__vorlage=spring/spring-producer--json--messages--vorlage
-spring__spring_producer__json__messages__vorlage__ROOT=spring/spring-producer--json--messages
-spring__spring_consumer__json__messages=spring/spring-consumer--json--messages
-spring__spring_consumer__json__messages__ROOT=spring/spring-consumer--json
-spring__spring_consumer__json__messages__vorlage=spring/spring-consumer--json--messages--vorlage
-spring__spring_consumer__json__messages__vorlage__ROOT=spring/spring-consumer--json--messages
 spring__sumup_messages=spring/sumup-messages
 spring__sumup_messages__ROOT=spring/spring-consumer--json
 spring__sumup_messages__vorlage=spring/sumup-messages--vorlage
 spring__sumup_messages__vorlage__ROOT=spring/sumup-messages
+spring__spring_consumer__json__messages=spring/spring-consumer--json--messages
+spring__spring_consumer__json__messages__ROOT=spring/spring-consumer--json
+spring__spring_consumer__json__messages__vorlage=spring/spring-consumer--json--messages--vorlage
+spring__spring_consumer__json__messages__vorlage__ROOT=spring/spring-consumer--json--messages
 spring__spring_consumer__kafkahandler=spring/spring-consumer--kafkahandler
 spring__spring_consumer__kafkahandler__ROOT=spring/spring-consumer--json
+spring__supersimple_consumer=spring/supersimple-consumer
+spring__supersimple_consumer__ROOT=consumer/spring-consumer
+spring__supersimple_consumer__vorlage=spring/supersimple-consumer--vorlage
+spring__supersimple_consumer__vorlage__ROOT=spring/supersimple-consumer
+spring__spring_consumer__kafkalistener=spring/spring-consumer--kafkalistener
+spring__spring_consumer__kafkalistener__ROOT=consumer/spring-consumer
+spring__spring_consumer__kafkalistener__concurrency=spring/spring-consumer--kafkalistener--concurrency
+spring__spring_consumer__kafkalistener__concurrency__ROOT=spring/spring-consumer--kafkalistener
 spring__spring_consumer__kafkalistener__logic_error=spring/spring-consumer--kafkalistener--logic-error
 spring__spring_consumer__kafkalistener__logic_error__ROOT=spring/spring-consumer--kafkalistener
 spring__spring_consumer__kafkalistener__long=spring/spring-consumer--kafkalistener--long
@@ -129,12 +129,9 @@ spring__spring_consumer__kafkalistener__deserialization_error=spring/spring-cons
 spring__spring_consumer__kafkalistener__deserialization_error__ROOT=spring/spring-consumer--kafkalistener--long
 
 BRANCHES="\
+  producer__batch_size__vorlage \
   grundlagen__simple_producer \
   grundlagen__simple_producer__vorlage \
-  grundlagen__simple_consumer \
-  grundlagen__simple_consumer__vorlage \
-  grundlagen__simple_consumer__consumergroup__vorlage \
-  producer__batch_size__vorlage \
   producer__spring_producer \
   producer__spring_producer__vorlage \
   producer__spring_producer__fixedsharding \
@@ -145,7 +142,19 @@ BRANCHES="\
   producer__spring_producer__backpressure__vorlage \
   producer__spring_producer__auditheaders \
   producer__spring_producer__auditheaders__vorlage \
+  producer__spring_producer__long \
+  producer__spring_producer__long__vorlage \
   producer__rest_producer \
+  spring__spring_producer__json \
+  spring__spring_producer__json__vorlage \
+  spring__spring_producer__json__messages \
+  spring__spring_producer__json__messages__vorlage \
+  spring__spring_producer__kafkatemplate \
+  spring__spring_producer__kafkatemplate__vorlage \
+  spring__supersimple_producer \
+  grundlagen__simple_consumer \
+  grundlagen__simple_consumer__vorlage \
+  grundlagen__simple_consumer__consumergroup__vorlage \
   consumer__simple_consumer__megagroup__vorlage \
   consumer__simple_consumer__spickzettel__vorlage \
   consumer__spring_consumer \
@@ -157,8 +166,6 @@ BRANCHES="\
   consumer__spring_consumer__seek__vorlage \
   consumer__spring_consumer__logic_error \
   consumer__spring_consumer__logic_error__vorlage \
-  producer__spring_producer__long \
-  producer__spring_producer__long__vorlage \
   consumer__spring_consumer__long \
   consumer__spring_consumer__deserialization_error \
   consumer__spring_consumer__deserialization_error__vorlage \
@@ -166,24 +173,17 @@ BRANCHES="\
   consumer__spring_consumer__health_indicator \
   consumer__spring_consumer__error_handling \
   consumer__spring_consumer__assign \
-  spring__spring_producer__kafkatemplate \
-  spring__spring_producer__kafkatemplate__vorlage \
-  spring__supersimple_producer \
-  spring__supersimple_consumer \
-  spring__supersimple_consumer__vorlage \
-  spring__spring_consumer__kafkalistener \
-  spring__spring_consumer__kafkalistener__concurrency \
-  spring__spring_producer__json \
-  spring__spring_producer__json__vorlage \
   spring__spring_consumer__json \
   spring__spring_consumer__json__vorlage \
-  spring__spring_producer__json__messages \
-  spring__spring_producer__json__messages__vorlage \
-  spring__spring_consumer__json__messages \
-  spring__spring_consumer__json__messages__vorlage \
   spring__sumup_messages \
   spring__sumup_messages__vorlage \
+  spring__spring_consumer__json__messages \
+  spring__spring_consumer__json__messages__vorlage \
   spring__spring_consumer__kafkahandler \
+  spring__supersimple_consumer \
+  spring__supersimple_consumer__vorlage \
+  spring__spring_consumer__kafkalistener \
+  spring__spring_consumer__kafkalistener__concurrency \
   spring__spring_consumer__kafkalistener__logic_error \
   spring__spring_consumer__kafkalistener__long \
   spring__spring_consumer__kafkalistener__deserialization_error \