From e5b13ad31b6be4be1d1185e7fa5e47845f37370f Mon Sep 17 00:00:00 2001
From: Sebastian Oltmanns <sebastian.oltmanns.developer@gmail.com>
Date: Wed, 15 Mar 2023 09:05:55 +0100
Subject: [PATCH 1/3] added new autoconfiguration import file that is required
 since spring-boot 3

---
 ....springframework.boot.autoconfigure.AutoConfiguration.imports | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 spring-multirabbit/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/spring-multirabbit/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-multirabbit/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..19ae76e
--- /dev/null
+++ b/spring-multirabbit/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.amqp.MultiRabbitAutoConfiguration

From 6fab1952a8da1aa3fc33d377ae2fcacfe52fd7a9 Mon Sep 17 00:00:00 2001
From: Sebastian Oltmanns <sebastian.oltmanns.developer@gmail.com>
Date: Wed, 15 Mar 2023 09:38:27 +0100
Subject: [PATCH 2/3] upgraded all spring-boot dependencies to version 3.
 upgraded java version to 17 and kotlin version to 1.8.10. replaced javax
 import with jakarta import.

---
 .github/workflows/maven.yml                        |  8 ++++----
 pom.xml                                            |  8 ++++----
 .../spring-multirabbit-example-java/pom.xml        |  6 +++---
 .../spring-multirabbit-example-kotlin/pom.xml      | 14 ++++++++++----
 .../spring-multirabbit-extension-example/pom.xml   | 10 +++++-----
 spring-multirabbit/pom.xml                         |  8 ++++----
 .../autoconfigure/amqp/MultiRabbitProperties.java  |  2 +-
 7 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1f1e72d..5b5aad1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8 ]
+        java: [ 17 ]
     name: Build on Java ${{ matrix.java }}
     steps:
       - name: Checkout source code
@@ -35,10 +35,10 @@ jobs:
       - name: Checkout source code
         uses: actions/checkout@v2
 
-      - name: Setup Java 1.8
+      - name: Setup Java 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
 
       - name: Cache Maven packages
         uses: actions/cache@v2
@@ -72,4 +72,4 @@ jobs:
           maven-args: "-DskipTests -DskipITs"
 
         env:
-          JAVA_HOME: /usr/lib/jvm/java-1.8-openjdk/
+          JAVA_HOME: /usr/lib/jvm/java-17-openjdk/
diff --git a/pom.xml b/pom.xml
index cbd6545..fada8ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.free-now.multirabbit</groupId>
     <artifactId>spring-multirabbit-parent</artifactId>
-    <version>2.7.1-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>pom</packaging>
 
     <name>Spring MultiRabbit</name>
@@ -54,9 +54,9 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
 
-        <springboot.version>2.7.0</springboot.version>
+        <springboot.version>3.0.0</springboot.version>
         <testcontainers-rabbitmq.version>1.17.1</testcontainers-rabbitmq.version>
         <java-jna.version>5.8.0</java-jna.version>
 
@@ -187,4 +187,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
index d447622..47ca4f3 100644
--- a/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
+++ b/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.0</version>
+        <version>3.0.0</version>
         <relativePath />
     </parent>
 
     <groupId>com.free-now.multirabbit</groupId>
     <artifactId>spring-multirabbit-example-java</artifactId>
-    <version>2.7.1-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>Spring MultiRabbit Example for Java</name>
@@ -70,4 +70,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
index 533a08c..54685ff 100644
--- a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
+++ b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
@@ -6,18 +6,22 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.0</version>
+        <version>3.0.0</version>
         <relativePath />
     </parent>
 
     <groupId>com.free-now.multirabbit</groupId>
     <artifactId>spring-multirabbit-example-kotlin</artifactId>
-    <version>2.7.1-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>Spring MultiRabbit Example for Kotlin</name>
     <description>Example module to showcase spring-multirabbit with Kotlin</description>
 
+    <properties>
+        <kotlin.version>1.8.10</kotlin.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.free-now.multirabbit</groupId>
@@ -35,11 +39,13 @@
 
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${kotlin.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-reflect</artifactId>
+            <version>${kotlin.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
@@ -124,4 +130,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml b/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
index 9292e3d..446e848 100644
--- a/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
+++ b/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
@@ -6,21 +6,21 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.0</version>
+        <version>3.0.0</version>
         <relativePath />
     </parent>
 
     <groupId>com.free-now.multirabbit</groupId>
     <artifactId>spring-multirabbit-extended-example-java</artifactId>
-    <version>2.7.1-SNAPSHOT</version>
+    <version>3.0.0</version>
     <packaging>jar</packaging>
 
     <name>Spring MultiRabbit Extension Example</name>
     <description>Example module to showcase extension of spring-multirabbit</description>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -75,4 +75,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-multirabbit/pom.xml b/spring-multirabbit/pom.xml
index 5b93318..8fc2f00 100644
--- a/spring-multirabbit/pom.xml
+++ b/spring-multirabbit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.free-now.multirabbit</groupId>
         <artifactId>spring-multirabbit-parent</artifactId>
-        <version>2.7.1-SNAPSHOT</version>
+        <version>3.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,8 +32,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -71,4 +71,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-multirabbit/src/main/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitProperties.java b/spring-multirabbit/src/main/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitProperties.java
index 6631adc..b139027 100644
--- a/spring-multirabbit/src/main/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitProperties.java
+++ b/spring-multirabbit/src/main/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitProperties.java
@@ -3,7 +3,7 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.lang.Nullable;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

From 23bbb121f27998372a124153af85cbe82c5afde7 Mon Sep 17 00:00:00 2001
From: Sebastian Oltmanns <sebastian.oltmanns.developer@gmail.com>
Date: Wed, 22 Mar 2023 11:37:56 +0100
Subject: [PATCH 3/3] upgraded spring boot version to 3.0.4

---
 pom.xml                                                         | 2 +-
 .../spring-multirabbit-example-java/pom.xml                     | 2 +-
 .../spring-multirabbit-example-kotlin/pom.xml                   | 2 +-
 .../spring-multirabbit-extension-example/pom.xml                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index fada8ad..6c814fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
 
-        <springboot.version>3.0.0</springboot.version>
+        <springboot.version>3.0.4</springboot.version>
         <testcontainers-rabbitmq.version>1.17.1</testcontainers-rabbitmq.version>
         <java-jna.version>5.8.0</java-jna.version>
 
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
index 47ca4f3..e38a403 100644
--- a/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
+++ b/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.4</version>
         <relativePath />
     </parent>
 
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
index 54685ff..f54da5d 100644
--- a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
+++ b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.4</version>
         <relativePath />
     </parent>
 
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml b/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
index 446e848..56bcf67 100644
--- a/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
+++ b/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.4</version>
         <relativePath />
     </parent>