build: upgrade to jdk 25 and dependencies

.github/workflows/build_workflow.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 21
+          java-version: 25
       - name: Cache Maven dependencies
         uses: actions/cache@v4
         with:

.sdkmanrc

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=25.0.3-tem

ff4j-spring-boot-autoconfigure-common/pom.xml

@@ -31,10 +31,6 @@
       <groupId>org.ff4j</groupId>
       <artifactId>ff4j-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jakarta.annotation</groupId>
-      <artifactId>jakarta.annotation-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot</artifactId>

ff4j-spring-boot-starter-webmvc/pom.xml

@@ -14,7 +14,7 @@
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
+      <artifactId>spring-boot-starter-webmvc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ff4j</groupId>

ff4j-spring-rest-api/pom.xml

@@ -77,6 +77,12 @@
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-test-junit</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -85,7 +91,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
+      <artifactId>spring-boot-starter-webmvc</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

ff4j-spring-rest-api/src/main/kotlin/org/ff4j/spring/rest/api/resources/FF4jResource.kt

@@ -33,7 +33,6 @@ import org.ff4j.services.domain.AuthorizationsManagerApiBean
 import org.ff4j.services.domain.FF4jStatusApiBean
 import org.ff4j.services.exceptions.FeatureNotFoundException
 import org.ff4j.web.FF4jWebConstants.*
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
@@ -47,7 +46,7 @@ import reactor.core.publisher.Mono
 @Tag(name = "FF4J", description = "The API for global status of FF4J")
 @RestController
 @RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}"])
-class FF4jResource(@Autowired val ff4JServices: FF4jServices) {
+class FF4jResource(val ff4JServices: FF4jServices) {
 
   @Operation(
     summary = "Gets ff4j status overview",

ff4j-spring-rest-api/src/main/kotlin/org/ff4j/spring/rest/api/resources/FeatureResource.kt

@@ -39,7 +39,6 @@ import org.ff4j.services.domain.FeatureApiBean
 import org.ff4j.spring.rest.api.utils.FeatureWebUtils
 import org.ff4j.services.model.FeatureActions
 import org.ff4j.web.FF4jWebConstants.*
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus.ACCEPTED
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
@@ -52,7 +51,7 @@ import reactor.core.publisher.Mono
 @Tag(name = "Feature", description = "The API for feature related operations")
 @RestController
 @RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_STORE$RESOURCE_FEATURES/$PATH_PARAM_UID"])
-class FeatureResource(@Autowired val featureServices: FeatureServices) {
+class FeatureResource(val featureServices: FeatureServices) {
 
   @Operation(summary = "Get feature by uid", description = "Get feature by uid", tags = ["Feature"])
   @ApiResponses(

ff4j-spring-rest-api/src/main/kotlin/org/ff4j/spring/rest/api/resources/FeatureStoreResource.kt

@@ -36,7 +36,6 @@ import org.ff4j.services.domain.FeatureApiBean
 import org.ff4j.services.domain.FeatureStoreApiBean
 import org.ff4j.services.domain.GroupDescApiBean
 import org.ff4j.web.FF4jWebConstants.*
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus.NO_CONTENT
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
@@ -53,7 +52,7 @@ import reactor.core.publisher.Mono
 @Tag(name = "FeatureStore", description = "The API for accessing the store of all features")
 @RestController
 @RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_STORE"])
-class FeatureStoreResource(@Autowired val featureStoreService: FeatureStoreServices) {
+class FeatureStoreResource(val featureStoreService: FeatureStoreServices) {
 
   @Operation(summary = "Displays information regarding the FeaturesStore", tags = ["FeatureStore"])
   @ApiResponses(

ff4j-spring-rest-api/src/main/kotlin/org/ff4j/spring/rest/api/resources/GroupResource.kt

@@ -35,7 +35,6 @@ import org.ff4j.services.constants.FeatureConstants.RESOURCE_STORE
 import org.ff4j.services.domain.FeatureApiBean
 import org.ff4j.web.FF4jWebConstants.OPERATION_DISABLE
 import org.ff4j.web.FF4jWebConstants.OPERATION_ENABLE
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
@@ -47,7 +46,7 @@ import reactor.core.publisher.Flux
 @Tag(name = "Groups", description = "The API for group related operations")
 @RestController
 @RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_STORE$RESOURCE_GROUPS/$PATH_PARAM_GROUP"])
-class GroupResource(@Autowired val groupServices: GroupServices) {
+class GroupResource(val groupServices: GroupServices) {
 
   @Operation(summary = "Get all the features belonging to the group", tags = ["Groups"])
   @ApiResponses(

ff4j-spring-rest-api/src/main/kotlin/org/ff4j/spring/rest/api/resources/MonitoringResource.kt

@@ -32,7 +32,6 @@ import org.ff4j.services.constants.FeatureConstants.RESOURCE_MONITORING
 import org.ff4j.services.domain.EventRepositoryApiBean
 import org.ff4j.web.FF4jWebConstants.PARAM_END
 import org.ff4j.web.FF4jWebConstants.PARAM_START
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.GetMapping
@@ -47,7 +46,7 @@ import reactor.core.publisher.Mono
 @Tag(name = "Monitoring", description = "The API for monitoring related operations")
 @RestController
 @RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_MONITORING"])
-class MonitoringResource(@Autowired val monitoringServices: MonitoringServices) {
+class MonitoringResource(val monitoringServices: MonitoringServices) {
 
   @Operation(
     summary = "Display Monitoring information for all features",

ff4j-spring-rest-api/src/main/kotlin/org/ff4j/spring/rest/api/resources/PropertyResource.kt

@@ -37,7 +37,6 @@ import org.ff4j.services.constants.FeatureConstants.RESOURCE_PROPERTY_STORE
 import org.ff4j.services.domain.PropertyApiBean
 import org.ff4j.spring.rest.api.utils.FeatureWebUtils
 import org.ff4j.web.FF4jWebConstants.OPERATION_UPDATE
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus.ACCEPTED
 import org.springframework.http.HttpStatus.NO_CONTENT
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
@@ -51,7 +50,7 @@ import reactor.core.publisher.Mono
 @Tag(name = "Property", description = "The API for property related operations")
 @RestController
 @RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_PROPERTY_STORE$RESOURCE_PROPERTIES/$PATH_PARAM_NAME"])
-class PropertyResource(@Autowired val propertyServices: PropertyServices) {
+class PropertyResource(val propertyServices: PropertyServices) {
 
   @Operation(summary = "Read information about a property", tags = ["Property"])
   @ApiResponses(

ff4j-spring-rest-api/src/main/kotlin/org/ff4j/spring/rest/api/resources/PropertyStoreResource.kt

@@ -36,7 +36,6 @@ import org.ff4j.services.domain.PropertyApiBean
 import org.ff4j.services.domain.PropertyStoreApiBean
 import org.ff4j.web.FF4jWebConstants.RESOURCE_CACHE
 import org.ff4j.web.FF4jWebConstants.STORE_CLEAR
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus.NO_CONTENT
 import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import org.springframework.http.ResponseEntity
@@ -53,7 +52,7 @@ import reactor.core.publisher.Mono
 @Tag(name = "PropertyStore", description = "The API for accessing the store for all properties")
 @RestController
 @RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_PROPERTY_STORE"])
-class PropertyStoreResource(@Autowired val propertyStoreServices: PropertyStoreServices) {
+class PropertyStoreResource(val propertyStoreServices: PropertyStoreServices) {
 
   @Operation(summary = "Display information regarding Properties Store", tags = ["PropertyStore"])
   @ApiResponses(

ff4j-spring-services/pom.xml

@@ -88,6 +88,12 @@
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-test-junit</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

ff4j-spring-services/src/main/kotlin/org/ff4j/services/FF4jServices.kt

@@ -25,15 +25,14 @@ import org.ff4j.services.domain.AuthorizationsManagerApiBean
 import org.ff4j.services.domain.FF4jStatusApiBean
 import org.ff4j.services.exceptions.AuthorizationNotExistsException
 import org.ff4j.services.validator.FeatureValidator
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import reactor.core.publisher.Mono
 
 /**
  * @author [Paul Williams](mailto:paul58914080@gmail.com)
  */
 @Service
-class FF4jServices(@Autowired val fF4j: FF4j, @Autowired val ff4jValidator: FeatureValidator) {
+class FF4jServices(val fF4j: FF4j, val ff4jValidator: FeatureValidator) {
 
   fun getStatus(): Mono<FF4jStatusApiBean> {
     return Mono.just(FF4jStatusApiBean(this.fF4j))

ff4j-spring-services/src/main/kotlin/org/ff4j/services/MonitoringServices.kt

@@ -21,15 +21,14 @@ package org.ff4j.services
 
 import org.ff4j.FF4j
 import org.ff4j.services.domain.EventRepositoryApiBean
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import reactor.core.publisher.Mono
 
 /**
  * @author [Paul Williams](mailto:paul58914080@gmail.com)
  */
 @Service
-class MonitoringServices(@Autowired val fF4j: FF4j) {
+class MonitoringServices(val fF4j: FF4j) {
 
   fun getMonitoringStatus(): Mono<EventRepositoryApiBean> {
     return Mono.just(EventRepositoryApiBean(fF4j.eventRepository))

ff4j-spring-services/src/test/kotlin/org/ff4j/services/constants/CommonConstantsTest.kt

@@ -20,7 +20,7 @@
 package org.ff4j.services.constants
 
 import org.assertj.core.api.Assertions
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 /**
  * @author [Paul Williams](mailto:paul58914080@gmail.com)

ff4j-spring-services/src/test/kotlin/org/ff4j/services/constants/FeatureConstantsTest.kt

@@ -20,7 +20,7 @@
 package org.ff4j.services.constants
 
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 /**
  * @author [Paul Williams](mailto:paul58914080@gmail.com)

ff4j-spring-services/src/test/kotlin/org/ff4j/services/domain/BarSeriesApiBeanTest.kt

@@ -21,7 +21,7 @@ package org.ff4j.services.domain
 
 import org.assertj.core.api.Assertions
 import org.ff4j.services.constants.CommonConstants
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 /**
  * @author [Paul Williams](mailto:paul58914080@gmail.com)

ff4j-spring-services/src/test/kotlin/org/ff4j/services/domain/DomainTest.kt

@@ -19,8 +19,8 @@
  */
 package org.ff4j.services.domain
 
-import org.junit.Assert
-import org.junit.Test
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
 import org.meanbean.test.BeanTester
 
 /**
@@ -32,7 +32,7 @@ class DomainTest {
 
   @Test
   fun getterAndSetterCorrectness() {
-    Assert.assertTrue(true)
+    Assertions.assertTrue(true)
     beanTester.testBean(FeatureApiBean::class.java)
     beanTester.testBean(FeatureStoreApiBean::class.java)
     beanTester.testBean(PropertyStoreApiBean::class.java)

ff4j-spring-services/src/test/kotlin/org/ff4j/services/domain/PieSectorApiBeanTest.kt

@@ -21,7 +21,7 @@ package org.ff4j.services.domain
 
 import org.assertj.core.api.Assertions
 import org.ff4j.services.constants.CommonConstants
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 /**
  * @author [Paul Williams](mailto:paul58914080@gmail.com)

pom.xml

@@ -72,18 +72,18 @@
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>21</java.version>
-    <spring-boot.version>4.0.1</spring-boot.version>
+    <java.version>25</java.version>
+    <spring-boot.version>4.1.0</spring-boot.version>
     <ff4j.version>2.1</ff4j.version>
-    <jackson-module-kotlin.version>2.21.0</jackson-module-kotlin.version>
-    <kotlin.version>2.3.0</kotlin.version>
-    <cucumber.version>7.33.0</cucumber.version>
-    <junit-jupiter.version>6.0.2</junit-jupiter.version>
-    <springdoc-openapi-starter.version>3.0.1</springdoc-openapi-starter.version>
+    <jackson-module-kotlin.version>3.1.4</jackson-module-kotlin.version>
+    <kotlin.version>2.4.0</kotlin.version>
+    <cucumber.version>7.34.4</cucumber.version>
+    <junit-jupiter.version>6.1.0</junit-jupiter.version>
+    <springdoc-openapi-starter.version>3.0.3</springdoc-openapi-starter.version>
     <meanbean.version>2.0.3</meanbean.version>
     <!-- plugin -->
-    <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
-    <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+    <maven-surefire-plugin.version>3.5.6</maven-surefire-plugin.version>
+    <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
     <license-maven-plugin.version>2.7.1</license-maven-plugin.version>
     <maven-resources-plugin.version>3.4.0</maven-resources-plugin.version>
     <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
@@ -92,7 +92,7 @@
     <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
     <aven-source-plugin.version>3.4.0</aven-source-plugin.version>
     <dokka-maven-plugin.version>2.1.0</dokka-maven-plugin.version>
-    <jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
+    <jacoco-maven-plugin.version>0.8.15</jacoco-maven-plugin.version>
     <maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
     <dokka.plugin.version>0.10.0</dokka.plugin.version>
     <kotlin.code.style>official</kotlin.code.style>
@@ -183,7 +183,7 @@
         <version>${kotlin.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.fasterxml.jackson.module</groupId>
+        <groupId>tools.jackson.module</groupId>
         <artifactId>jackson-module-kotlin</artifactId>
         <version>${jackson-module-kotlin.version}</version>
       </dependency>
@@ -233,7 +233,7 @@
       <artifactId>kotlin-stdlib</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
+      <groupId>tools.jackson.module</groupId>
       <artifactId>jackson-module-kotlin</artifactId>
     </dependency>
   </dependencies>
@@ -368,6 +368,7 @@
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
+          <release>${java.version}</release>
         </configuration>
       </plugin>
       <!-- license -->