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..6c814fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.free-now.multirabbit
spring-multirabbit-parent
- 2.7.1-SNAPSHOT
+ 3.0.0
pom
Spring MultiRabbit
@@ -54,9 +54,9 @@
UTF-8
UTF-8
- 1.8
+ 17
- 2.7.0
+ 3.0.4
1.17.1
5.8.0
@@ -187,4 +187,4 @@
-
\ No newline at end of file
+
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml
index d447622..e38a403 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 @@
org.springframework.boot
spring-boot-starter-parent
- 2.7.0
+ 3.0.4
com.free-now.multirabbit
spring-multirabbit-example-java
- 2.7.1-SNAPSHOT
+ 3.0.0
jar
Spring MultiRabbit Example for Java
@@ -70,4 +70,4 @@
-
\ No newline at end of file
+
diff --git a/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml b/spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml
index 533a08c..f54da5d 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 @@
org.springframework.boot
spring-boot-starter-parent
- 2.7.0
+ 3.0.4
com.free-now.multirabbit
spring-multirabbit-example-kotlin
- 2.7.1-SNAPSHOT
+ 3.0.0
jar
Spring MultiRabbit Example for Kotlin
Example module to showcase spring-multirabbit with Kotlin
+
+ 1.8.10
+
+
com.free-now.multirabbit
@@ -35,11 +39,13 @@
org.jetbrains.kotlin
- kotlin-stdlib-jdk8
+ kotlin-stdlib
+ ${kotlin.version}
org.jetbrains.kotlin
kotlin-reflect
+ ${kotlin.version}
com.fasterxml.jackson.module
@@ -124,4 +130,4 @@
-
\ No newline at end of file
+
diff --git a/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml b/spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml
index 9292e3d..56bcf67 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 @@
org.springframework.boot
spring-boot-starter-parent
- 2.7.0
+ 3.0.4
com.free-now.multirabbit
spring-multirabbit-extended-example-java
- 2.7.1-SNAPSHOT
+ 3.0.0
jar
Spring MultiRabbit Extension Example
Example module to showcase extension of spring-multirabbit
- 1.8
- 1.8
+ 17
+ 17
@@ -75,4 +75,4 @@
-
\ No newline at end of file
+
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 @@
com.free-now.multirabbit
spring-multirabbit-parent
- 2.7.1-SNAPSHOT
+ 3.0.0
../pom.xml
@@ -32,8 +32,8 @@
provided
- javax.validation
- validation-api
+ jakarta.validation
+ jakarta.validation-api
org.springframework.boot
@@ -71,4 +71,4 @@
-
\ No newline at end of file
+
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;
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