From 8a398014097a789c53678c348ed3b82a07df0fae Mon Sep 17 00:00:00 2001
From: Travis-CI <swisspush@post.ch>
Date: Thu, 2 Sep 2021 07:35:24 +0000
Subject: [PATCH 1/7] updating poms for 1.0.3 branch with snapshot versions

---
 kobuka-client/pom.xml | 4 +---
 kobuka-gen/pom.xml    | 4 +---
 kobuka-spring/pom.xml | 4 +---
 pom.xml               | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/kobuka-client/pom.xml b/kobuka-client/pom.xml
index 56a86d3..c1b6849 100644
--- a/kobuka-client/pom.xml
+++ b/kobuka-client/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
diff --git a/kobuka-gen/pom.xml b/kobuka-gen/pom.xml
index d35ce8a..c5a76c5 100644
--- a/kobuka-gen/pom.xml
+++ b/kobuka-gen/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
diff --git a/kobuka-spring/pom.xml b/kobuka-spring/pom.xml
index 9cee767..2623940 100644
--- a/kobuka-spring/pom.xml
+++ b/kobuka-spring/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
diff --git a/pom.xml b/pom.xml
index d88ab2a..8b81902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.swisspush</groupId>

From 8527e7f4a7c7ae9489adccc7cba31b3f5ca32291 Mon Sep 17 00:00:00 2001
From: Travis-CI <swisspush@post.ch>
Date: Thu, 2 Sep 2021 07:35:24 +0000
Subject: [PATCH 2/7] updating poms for 1.0.4-SNAPSHOT development

---
 kobuka-client/pom.xml | 6 ++----
 kobuka-gen/pom.xml    | 6 ++----
 kobuka-spring/pom.xml | 6 ++----
 pom.xml               | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/kobuka-client/pom.xml b/kobuka-client/pom.xml
index 56a86d3..97a6f29 100644
--- a/kobuka-client/pom.xml
+++ b/kobuka-client/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-gen/pom.xml b/kobuka-gen/pom.xml
index d35ce8a..3df33b2 100644
--- a/kobuka-gen/pom.xml
+++ b/kobuka-gen/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-spring/pom.xml b/kobuka-spring/pom.xml
index 9cee767..71d3fd5 100644
--- a/kobuka-spring/pom.xml
+++ b/kobuka-spring/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index d88ab2a..58f6169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.swisspush</groupId>
     <artifactId>kobuka</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
     <name>kobuka</name>
     <description>Config Builders for Kafka. A fluent API for configuring kafka clients.</description>
     <url>https://github.com/swisspush/kobuka</url>

From a2c86bd28ad84b124fd39b5d73dd4bf486d63c21 Mon Sep 17 00:00:00 2001
From: Travis-CI <swisspush@post.ch>
Date: Thu, 2 Sep 2021 07:35:25 +0000
Subject: [PATCH 3/7] updating poms for branch'release-1.0.3' with non-snapshot
 versions

---
 kobuka-client/pom.xml | 2 +-
 kobuka-gen/pom.xml    | 2 +-
 kobuka-spring/pom.xml | 2 +-
 pom.xml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kobuka-client/pom.xml b/kobuka-client/pom.xml
index c1b6849..8e991f4 100644
--- a/kobuka-client/pom.xml
+++ b/kobuka-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-gen/pom.xml b/kobuka-gen/pom.xml
index c5a76c5..b2b7b1e 100644
--- a/kobuka-gen/pom.xml
+++ b/kobuka-gen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-spring/pom.xml b/kobuka-spring/pom.xml
index 2623940..2742f12 100644
--- a/kobuka-spring/pom.xml
+++ b/kobuka-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 8b81902..0f1b920 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.swisspush</groupId>
     <artifactId>kobuka</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
     <name>kobuka</name>
     <description>Config Builders for Kafka. A fluent API for configuring kafka clients.</description>
     <url>https://github.com/swisspush/kobuka</url>

From beca1ec8b67b302331d575e9b6781f85adb3af78 Mon Sep 17 00:00:00 2001
From: Travis-CI <swisspush@post.ch>
Date: Thu, 2 Sep 2021 07:35:57 +0000
Subject: [PATCH 4/7] updating develop poms to master versions to avoid merge
 conflicts

---
 kobuka-client/pom.xml | 2 +-
 kobuka-gen/pom.xml    | 2 +-
 kobuka-spring/pom.xml | 2 +-
 pom.xml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kobuka-client/pom.xml b/kobuka-client/pom.xml
index 97a6f29..8e991f4 100644
--- a/kobuka-client/pom.xml
+++ b/kobuka-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-gen/pom.xml b/kobuka-gen/pom.xml
index 3df33b2..b2b7b1e 100644
--- a/kobuka-gen/pom.xml
+++ b/kobuka-gen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-spring/pom.xml b/kobuka-spring/pom.xml
index 71d3fd5..2742f12 100644
--- a/kobuka-spring/pom.xml
+++ b/kobuka-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 58f6169..0f1b920 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.swisspush</groupId>
     <artifactId>kobuka</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.3</version>
     <name>kobuka</name>
     <description>Config Builders for Kafka. A fluent API for configuring kafka clients.</description>
     <url>https://github.com/swisspush/kobuka</url>

From 59944a12c1521bae36b2d017853b089d5cc7a156 Mon Sep 17 00:00:00 2001
From: Travis-CI <swisspush@post.ch>
Date: Thu, 2 Sep 2021 07:35:57 +0000
Subject: [PATCH 5/7] Updating develop poms back to pre merge state

---
 kobuka-client/pom.xml | 2 +-
 kobuka-gen/pom.xml    | 2 +-
 kobuka-spring/pom.xml | 2 +-
 pom.xml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kobuka-client/pom.xml b/kobuka-client/pom.xml
index 8e991f4..97a6f29 100644
--- a/kobuka-client/pom.xml
+++ b/kobuka-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-gen/pom.xml b/kobuka-gen/pom.xml
index b2b7b1e..3df33b2 100644
--- a/kobuka-gen/pom.xml
+++ b/kobuka-gen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-spring/pom.xml b/kobuka-spring/pom.xml
index 2742f12..71d3fd5 100644
--- a/kobuka-spring/pom.xml
+++ b/kobuka-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 0f1b920..58f6169 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.swisspush</groupId>
     <artifactId>kobuka</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
     <name>kobuka</name>
     <description>Config Builders for Kafka. A fluent API for configuring kafka clients.</description>
     <url>https://github.com/swisspush/kobuka</url>

From 73b35e9629a4178e4d98afeb96bd8d7217fbebee Mon Sep 17 00:00:00 2001
From: "Dell'Anna Fabio, I237 extern" <fabio.dellanna@post.ch>
Date: Tue, 23 Nov 2021 08:12:58 +0100
Subject: [PATCH 6/7] Support for kafka-clients 3.0 and spring-kafka 2.8

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 58f6169..0267966 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,12 +107,12 @@
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>
-                <version>2.8.0</version>
+                <version>3.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.kafka</groupId>
                 <artifactId>spring-kafka</artifactId>
-                <version>2.7.6</version>
+                <version>2.8.0</version>
             </dependency>
             <dependency>
                 <groupId>com.squareup</groupId>

From 14060267e9af42619002cbf602faaeca40fcc8b0 Mon Sep 17 00:00:00 2001
From: Laurent Bovet <laurent.bovet@windmaster.ch>
Date: Thu, 27 Jan 2022 17:38:43 +0100
Subject: [PATCH 7/7] release: 1.1.0

---
 kobuka-client/pom.xml | 2 +-
 kobuka-gen/pom.xml    | 2 +-
 kobuka-spring/pom.xml | 2 +-
 pom.xml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kobuka-client/pom.xml b/kobuka-client/pom.xml
index 97a6f29..2d7c11f 100644
--- a/kobuka-client/pom.xml
+++ b/kobuka-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-gen/pom.xml b/kobuka-gen/pom.xml
index 3df33b2..e525877 100644
--- a/kobuka-gen/pom.xml
+++ b/kobuka-gen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/kobuka-spring/pom.xml b/kobuka-spring/pom.xml
index 71d3fd5..8254847 100644
--- a/kobuka-spring/pom.xml
+++ b/kobuka-spring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>kobuka</artifactId>
         <groupId>org.swisspush</groupId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 0267966..514ab61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.swisspush</groupId>
     <artifactId>kobuka</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>kobuka</name>
     <description>Config Builders for Kafka. A fluent API for configuring kafka clients.</description>
     <url>https://github.com/swisspush/kobuka</url>