Adapt to sprig-boot-3 (#87)

* Adapt to sprig-boot-3

.github/workflows/codecov.yml

@@ -22,10 +22,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

.github/workflows/integration-test.yml

@@ -21,10 +21,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}
@@ -50,10 +50,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}
@@ -69,10 +69,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}
@@ -93,10 +93,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

.github/workflows/package-deploy.yml

@@ -26,10 +26,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}
@@ -47,10 +47,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           settings-path: ${{ github.workspace }}

build.gradle.kts

@@ -77,7 +77,7 @@ configure(libraryProjects) {
     apply<KotlinPlatformJvmPlugin>()
     configure<KotlinJvmProjectExtension>() {
         jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(8))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {

gradle.properties

@@ -12,7 +12,7 @@
 #
 
 group=me.ahoo.simba
-version=0.6.8
+version=2.0.0
 description=Simba aims to provide easy-to-use and flexible distributed lock services and supports multiple storage implementations: relational databases, Redis, and Zookeeper.
 website=https://github.com/Ahoo-Wang/Simba
 issues=https://github.com/Ahoo-Wang/Simba/issues

simba-dependencies/build.gradle.kts

@@ -12,8 +12,8 @@
  */
 
 dependencies {
-    api(platform("org.springframework.boot:spring-boot-dependencies:2.7.12"))
-    api(platform("org.springframework.cloud:spring-cloud-dependencies:2021.0.7"))
+    api(platform("org.springframework.boot:spring-boot-dependencies:3.1.0"))
+    api(platform("org.springframework.cloud:spring-cloud-dependencies:2022.0.3"))
     api(platform("org.testcontainers:testcontainers-bom:1.18.3"))
     constraints {
         api("com.google.guava:guava:32.0.1-jre")

simba-example/build.gradle.kts

@@ -17,7 +17,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 application {

simba-spring-boot-starter/src/main/kotlin/me/ahoo/simba/spring/boot/starter/jdbc/JdbcProperties.kt

@@ -14,15 +14,13 @@ package me.ahoo.simba.spring.boot.starter.jdbc
 
 import me.ahoo.simba.Simba
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
 import java.time.Duration
 
 /**
  * Jdbc Properties.
  *
  * @author ahoo wang
  */
-@ConstructorBinding
 @ConfigurationProperties(prefix = JdbcProperties.PREFIX)
 data class JdbcProperties(
     val enabled: Boolean = true,

simba-spring-boot-starter/src/main/kotlin/me/ahoo/simba/spring/boot/starter/redis/RedisProperties.kt

@@ -14,15 +14,13 @@ package me.ahoo.simba.spring.boot.starter.redis
 
 import me.ahoo.simba.Simba
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
 import java.time.Duration
 
 /**
  * Redis Properties.
  *
  * @author ahoo wang
  */
-@ConstructorBinding
 @ConfigurationProperties(prefix = RedisProperties.PREFIX)
 data class RedisProperties(
     val enabled: Boolean = true,

simba-spring-boot-starter/src/main/kotlin/me/ahoo/simba/spring/boot/starter/zookeeper/SimbaZookeeperAutoConfiguration.kt

@@ -33,7 +33,7 @@ import java.util.concurrent.ForkJoinPool
     ZookeeperMutexContendServiceFactory::class
 )
 @EnableConfigurationProperties(ZookeeperProperties::class)
-class SimbaZookeeperAutoConfiguration(private val zookeeperProperties: ZookeeperProperties) {
+class SimbaZookeeperAutoConfiguration {
     @Bean
     @ConditionalOnBean(CuratorFramework::class)
     @ConditionalOnMissingBean

simba-spring-boot-starter/src/main/kotlin/me/ahoo/simba/spring/boot/starter/zookeeper/ZookeeperProperties.kt

@@ -14,14 +14,12 @@ package me.ahoo.simba.spring.boot.starter.zookeeper
 
 import me.ahoo.simba.Simba
 import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
 
 /**
  * Zookeeper Properties.
  *
  * @author ahoo wang
  */
-@ConstructorBinding
 @ConfigurationProperties(prefix = ZookeeperProperties.PREFIX)
 data class ZookeeperProperties(val enabled: Boolean = true) {