update code

Author: sonus21

README.md

@@ -54,7 +54,7 @@ well, where all services code is in Spring.
 
 * Spring 5+, 6+, 7+
 * Java 1.8+,17, 21
-* Spring boot 2+,3+
+* Spring boot 2+,3+,4+
 * Lettuce client for Redis cluster
 * Read master preference for Redis cluster
 
@@ -69,21 +69,22 @@ Release Version: [Maven central](https://search.maven.org/search?q=g:com.github.
 **NOTE:**
 
 * For Spring Boot 3.x use Rqueue 3.x
+* For Spring Boot 4.x use Rqueue 4.x
 
 Get the latest one
 from [Maven central](https://search.maven.org/search?q=g:com.github.sonus21%20AND%20a:rqueue-spring-boot-starter)
 
 * Add dependency
   * Gradle
     ```groovy
-        implementation 'com.github.sonus21:rqueue-spring-boot-starter:3.0.0-RELEASE'
+        implementation 'com.github.sonus21:rqueue-spring-boot-starter:4.0.0-RELEASE'
     ```
   * Maven
     ```xml
      <dependency>
         <groupId>com.github.sonus21</groupId>
         <artifactId>rqueue-spring-boot-starter</artifactId>
-        <version>3.0.0-RELEASE</version>
+        <version>4.0.0-RELEASE</version>
     </dependency>
     ```
 
@@ -96,21 +97,22 @@ from [Maven central](https://search.maven.org/search?q=g:com.github.sonus21%20AN
 **NOTE**
 
 * For Spring Framework 6.x use Rqueue 3.x
+* For Spring Framework 7.x use Rqueue 4.x
 
 Get the latest one
 from [Maven central](https://search.maven.org/search?q=g:com.github.sonus21%20AND%20a:rqueue-spring)
 
 * Add Dependency
   * Gradle
     ```groovy
-        implementation 'com.github.sonus21:rqueue-spring:3.0.0-RELEASE'
+        implementation 'com.github.sonus21:rqueue-spring:4.0.0-RELEASE'
     ```
   * Maven
     ```xml
      <dependency>
        <groupId>com.github.sonus21</groupId>
        <artifactId>rqueue-spring</artifactId>
-       <version>3.0.0-RELEASE</version>
+       <version>4.0.0-RELEASE</version>
      </dependency>
     ```
 * Add annotation `EnableRqueue` on application config class

build.gradle

@@ -35,10 +35,10 @@ allprojects {
 }
 
 ext {
-    springBootVersion = "3.5.0"
-    springVersion = "6.2.0"
-    springDataVersion = "3.5.0"
-    microMeterVersion = "1.15.0"
+    springBootVersion = "4.0.1"
+    springVersion = "7.0.3"
+    springDataVersion = "4.0.2"
+    microMeterVersion = "1.16.2"
 
     // logging dependencies
     lombokVersion = "1.18.42"
@@ -83,7 +83,7 @@ ext {
 
 subprojects {
     group = "com.github.sonus21"
-    version = "3.0.0-RELEASE"
+    version = "4.0.0-RELEASE"
 
     dependencies {
         // https://mvnrepository.com/artifact/org.springframework/spring-messaging

docs/CHANGELOG.md

@@ -46,10 +46,10 @@ This release fixes a critical bug where task multiplication caused excessive Red
 resource usage. For details, see issue #[193].
 
 
-## Release [3.0.0] 17-Jan-2022
+## Release [4.0.0] 17-Jan-2022
 
-We're so excited to release Rqueue `3.0.0`. This release supports Java 21,
-Spring Boot 3.x and Spring Framework 6.x.
+We're so excited to release Rqueue `4.0.0`. This release supports Java 21,
+Spring Boot 4.x and Spring Framework 7.x.
 
 ### [2.13.0] - 25-Dec-2022
 ### Fixes
@@ -382,7 +382,7 @@ Breaking change, for migration [see](./migration#1x-to-2x)
 
 [2.13.1]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/2.13.1-RELEASE
 
-[3.0.0]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/3.0.0-RELEASE
+[4.0.0]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/4.0.0-RELEASE
 
 [122]: https://github.com/sonus21/rqueue/issues/122
 [193]: https://github.com/sonus21/rqueue/issues/193

docs/index.md

@@ -50,8 +50,8 @@ frameworks.
 
 ### Requirements
 
-* Spring 6+
-* Spring Boot 3+
+* Spring 6+, 7+
+* Spring Boot 3+, 4+
 * Java 21+
 * Spring Reactive
 * Lettuce client for Redis cluster
@@ -81,24 +81,24 @@ Redis Cluster compatibility. Failure to do so may prevent the application from s
 ### Spring Boot
 
 {: .warning }
-Use Rqueue Spring Boot Starter 3.x for Spring Boot 3.x.
+Use Rqueue Spring Boot Starter 4.x for Spring Boot 4.x, and 3.x for Spring Boot 3.x.
 
 Download the latest version from [Maven Central][Boot Maven Central] and add the 
 dependency to your project:
 
-#### Spring Boot 3.x Setup
+#### Spring Boot 4.x Setup
 
 * Gradle
   ```groovy
-  implementation 'com.github.sonus21:rqueue-spring-boot-starter:3.0.0-RELEASE'
+  implementation 'com.github.sonus21:rqueue-spring-boot-starter:4.0.0-RELEASE'
   ```
 
 * Maven
   ```xml
   <dependency>
       <groupId>com.github.sonus21</groupId>
       <artifactId>rqueue-spring-boot-starter</artifactId>
-      <version>3.0.0-RELEASE</version>
+      <version>4.0.0-RELEASE</version>
   </dependency>
   ```
 
@@ -107,24 +107,24 @@ dependency to your project:
 ### Spring Framework
 
 {: .warning }
-Use Rqueue Spring 3.x for Spring Framework 6.x.
+Use Rqueue Spring 4.x for Spring Framework 7.x, and 3.x for Spring Framework 6.x.
 
 Download the latest version from [Maven Central][Maven Central] and add the 
 dependency to your project:
 
-#### Spring Framework 6.x Setup
+#### Spring Framework 7.x Setup
 
 * Gradle
   ```groovy
-  implementation 'com.github.sonus21:rqueue-spring:3.0.0-RELEASE'
+  implementation 'com.github.sonus21:rqueue-spring:4.0.0-RELEASE'
   ```
 
 * Maven
   ```xml
   <dependency>
       <groupId>com.github.sonus21</groupId>
       <artifactId>rqueue-spring</artifactId>
-      <version>3.0.0-RELEASE</version>
+      <version>4.0.0-RELEASE</version>
   </dependency>
   ```
 

rqueue-core/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     // https://mvnrepository.com/artifact/org.springframework/spring-webmvc
     api "org.springframework:spring-webmvc:${springVersion}"
     api "org.springframework:spring-webflux:${springVersion}"
-    api "io.pebbletemplates:pebble-spring6:${pebbleVersion}"
+    api "io.pebbletemplates:pebble-spring7:${pebbleVersion}"
     api "io.seruco.encoding:base62:${serucoEncodingVersion}"
     // https://mvnrepository.com/artifact/org.apache.commons/commons-collections4
     api "org.apache.commons:commons-collections4:${apacheCommonCollectionVerion}"

rqueue-spring-boot-starter/src/main/java/com/github/sonus21/rqueue/spring/boot/RqueueListenerAutoConfig.java

@@ -33,15 +33,15 @@
 import com.github.sonus21.rqueue.utils.condition.RqueueEnabled;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
 @Configuration
-@AutoConfigureAfter(RedisAutoConfiguration.class)
+@AutoConfigureAfter(DataRedisAutoConfiguration.class)
 @ComponentScan({"com.github.sonus21.rqueue.web", "com.github.sonus21.rqueue.dao"})
 @Conditional({RqueueEnabled.class})
 public class RqueueListenerAutoConfig extends RqueueListenerBaseConfig {

rqueue-spring-boot-starter/src/main/java/com/github/sonus21/rqueue/spring/boot/RqueueMetricsAutoConfig.java

@@ -28,8 +28,8 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties;
+import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;