Upgrade to Spring Boot 4.0.0 - Update dependencies and package references

Co-authored-by: nomeguy <85475922+nomeguy@users.noreply.github.com>

Author: Copilot

.gitignore

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

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;