Added SB3 support

.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/

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.4</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>
+</project>

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.4</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>
+</project>

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.4</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>
+</project>

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.4</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>
+</project>

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>
+</project>

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;

spring-multirabbit/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.amqp.MultiRabbitAutoConfiguration