feat: upgrade to Spring Boot 4.0.0

Author: Copilot

.github/workflows/maven-ci.yml

@@ -26,10 +26,10 @@ jobs:
         with:
           fetch-depth: '0'
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
           server-username: OSSRH_JIRA_USERNAME
           server-password: OSSRH_JIRA_PASSWORD
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}

.gitignore

@@ -27,3 +27,6 @@
 
 ### VS Code ###
 .vscode/
+
+### Maven ###
+target/

.semantic-release-trigger

@@ -0,0 +1,6 @@
+# Semantic Release Trigger
+
+This file triggers a major version release via semantic-release.
+
+Upgrade: Spring Boot 2.7.12 -> 4.0.0
+Breaking: Requires Java 17+ (was Java 8)

README.md

@@ -4,14 +4,20 @@
 [![GitHub Actions](https://github.com/jcasbin/casbin-spring-boot-starter/workflows/build/badge.svg)](https://github.com/jcasbin/casbin-spring-boot-starter/actions)
 [![Maven Central](https://img.shields.io/maven-central/v/org.casbin/casbin-spring-boot-starter.svg?style=flat-square&color=brightgreen)](https://mvnrepository.com/artifact/org.casbin/casbin-spring-boot-starter/latest)
 [![License](https://img.shields.io/github/license/jcasbin/casbin-spring-boot-starter.svg?style=flat-square&color=blue)](http://www.apache.org/licenses/LICENSE-2.0.txt)
-[![SpringBootVersion](https://img.shields.io/badge/SpringBoot-2.7.12-heightgreen.svg?style=flat-square)](https://spring.io/projects/spring-boot)
+[![SpringBootVersion](https://img.shields.io/badge/SpringBoot-4.0.0-brightgreen.svg?style=flat-square)](https://spring.io/projects/spring-boot)
+[![JavaVersion](https://img.shields.io/badge/Java-17+-blue.svg?style=flat-square)](https://openjdk.org/)
 [![CasbinVersion](https://img.shields.io/badge/jCasbin-1.81.0-heightgreen.svg?style=flat-square)](https://casbin.org)
 
 [![](https://raw.githubusercontent.com/casbin/jcasbin/master/casbin-logo.png)](https://casbin.org)
 
 Casbin Spring Boot Starter is designed to help you easily integrate [jCasbin](https://github.com/casbin/jcasbin) into
 your Spring Boot project.
 
+## Requirements
+
+- Java 17 or higher
+- Spring Boot 4.0.0 or higher
+
 ## how to use
 
 1. Add ```casbin-spring-boot-starter``` to the Spring Boot project.

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.12</version>
+        <version>4.0.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -77,13 +77,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>3.11.2</version>
                 <configuration>
-                    <additionalJOptions>
-                        <additionalJOption>
-                            -Xdoclint:none
-                        </additionalJOption>
-                    </additionalJOptions>
+                    <doclint>none</doclint>
                 </configuration>
                 <executions>
                     <execution>
@@ -97,7 +93,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.5</version>
+                <version>3.2.7</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -131,7 +127,7 @@
     </build>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>
@@ -182,9 +178,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>9.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/org/casbin/spring/boot/autoconfigure/CasbinAutoConfiguration.java

@@ -21,8 +21,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
-import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceProperties;
+import org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.context.annotation.Bean;

src/main/java/org/casbin/spring/boot/autoconfigure/CasbinRedisWatcherAutoConfiguration.java

@@ -13,8 +13,8 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,8 +30,8 @@
  * @date 2019-4-05 13:53
  */
 @Configuration
-@EnableConfigurationProperties({CasbinProperties.class, RedisProperties.class})
-@AutoConfigureAfter({RedisAutoConfiguration.class, CasbinAutoConfiguration.class})
+@EnableConfigurationProperties({CasbinProperties.class, DataRedisProperties.class})
+@AutoConfigureAfter({DataRedisAutoConfiguration.class, CasbinAutoConfiguration.class})
 @ConditionalOnExpression("'jdbc'.equalsIgnoreCase('${casbin.store-type:jdbc}') && ${casbin.enable-watcher:false} && 'redis'.equalsIgnoreCase('${casbin.watcher-type:redis}') ")
 public class CasbinRedisWatcherAutoConfiguration {
 
@@ -41,7 +41,7 @@ public class CasbinRedisWatcherAutoConfiguration {
     @ConditionalOnBean(RedisTemplate.class)
     @ConditionalOnMissingBean
     @ConditionalOnExpression("'redis'.equalsIgnoreCase('${casbin.watcher-type:redis}') && '${casbin.watcher-lettuce-redis-type:none}'.equalsIgnoreCase('none')")
-    public Watcher redisWatcher(RedisProperties redisProperties, CasbinProperties casbinProperties, Enforcer enforcer) {
+    public Watcher redisWatcher(DataRedisProperties redisProperties, CasbinProperties casbinProperties, Enforcer enforcer) {
         int timeout = redisProperties.getTimeout() != null ? (int) redisProperties.getTimeout().toMillis() : 2000;
         RedisWatcher watcher = new RedisWatcher(redisProperties.getHost(), redisProperties.getPort(),
                 casbinProperties.getPolicyTopic(), timeout, redisProperties.getPassword());
@@ -54,7 +54,7 @@ public Watcher redisWatcher(RedisProperties redisProperties, CasbinProperties ca
     @ConditionalOnBean(RedisTemplate.class)
     @ConditionalOnMissingBean
     @ConditionalOnExpression("'redis'.equalsIgnoreCase('${casbin.watcher-type:redis}') && ('${casbin.watcher-lettuce-redis-type:standalone}'.equalsIgnoreCase('standalone') || '${casbin.watcher-lettuce-redis-type:cluster}'.equalsIgnoreCase('cluster'))")
-    public Watcher lettuceRedisWatcher(RedisProperties redisProperties, CasbinProperties casbinProperties, Enforcer enforcer) {
+    public Watcher lettuceRedisWatcher(DataRedisProperties redisProperties, CasbinProperties casbinProperties, Enforcer enforcer) {
         int timeout = redisProperties.getTimeout() != null ? (int) redisProperties.getTimeout().toMillis() : 2000;
         if (casbinProperties.getWatcherLettuceRedisType().name().equalsIgnoreCase("standalone")) {
             LettuceRedisWatcher lettuceRedisWatcher = new LettuceRedisWatcher(redisProperties.getHost(), redisProperties.getPort(),

src/test/java/org/casbin/adapter/JdbcAdapterTest.java

@@ -9,7 +9,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;