Skip to content

Commit 8877cbd

Browse files
committed
build: upgrade to jdk 25 and dependencies
1 parent c12b522 commit 8877cbd

21 files changed

Lines changed: 47 additions & 44 deletions

File tree

.github/workflows/build_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/setup-java@v4
1414
with:
1515
distribution: temurin
16-
java-version: 21
16+
java-version: 25
1717
- name: Cache Maven dependencies
1818
uses: actions/cache@v4
1919
with:

.sdkmanrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Enable auto-env through the sdkman_auto_env config
2+
# Add key=value pairs of SDKs to use below
3+
java=25.0.3-tem

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<groupId>org.ff4j</groupId>
3232
<artifactId>ff4j-core</artifactId>
3333
</dependency>
34-
<dependency>
35-
<groupId>jakarta.annotation</groupId>
36-
<artifactId>jakarta.annotation-api</artifactId>
37-
</dependency>
3834
<dependency>
3935
<groupId>org.springframework.boot</groupId>
4036
<artifactId>spring-boot</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<dependencies>
1515
<dependency>
1616
<groupId>org.springframework.boot</groupId>
17-
<artifactId>spring-boot-starter-web</artifactId>
17+
<artifactId>spring-boot-starter-webmvc</artifactId>
1818
</dependency>
1919
<dependency>
2020
<groupId>org.ff4j</groupId>

ff4j-spring-rest-api/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@
7777
<groupId>org.jetbrains.kotlin</groupId>
7878
<artifactId>kotlin-test-junit</artifactId>
7979
<scope>test</scope>
80+
<exclusions>
81+
<exclusion>
82+
<groupId>junit</groupId>
83+
<artifactId>junit</artifactId>
84+
</exclusion>
85+
</exclusions>
8086
</dependency>
8187
<dependency>
8288
<groupId>org.springframework.boot</groupId>
@@ -85,7 +91,7 @@
8591
</dependency>
8692
<dependency>
8793
<groupId>org.springframework.boot</groupId>
88-
<artifactId>spring-boot-starter-web</artifactId>
94+
<artifactId>spring-boot-starter-webmvc</artifactId>
8995
<scope>test</scope>
9096
</dependency>
9197
<dependency>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import org.ff4j.services.domain.AuthorizationsManagerApiBean
3333
import org.ff4j.services.domain.FF4jStatusApiBean
3434
import org.ff4j.services.exceptions.FeatureNotFoundException
3535
import org.ff4j.web.FF4jWebConstants.*
36-
import org.springframework.beans.factory.annotation.Autowired
3736
import org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE
3837
import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
3938
import org.springframework.http.ResponseEntity
@@ -47,7 +46,7 @@ import reactor.core.publisher.Mono
4746
@Tag(name = "FF4J", description = "The API for global status of FF4J")
4847
@RestController
4948
@RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}"])
50-
class FF4jResource(@Autowired val ff4JServices: FF4jServices) {
49+
class FF4jResource(val ff4JServices: FF4jServices) {
5150

5251
@Operation(
5352
summary = "Gets ff4j status overview",

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import org.ff4j.services.domain.FeatureApiBean
3939
import org.ff4j.spring.rest.api.utils.FeatureWebUtils
4040
import org.ff4j.services.model.FeatureActions
4141
import org.ff4j.web.FF4jWebConstants.*
42-
import org.springframework.beans.factory.annotation.Autowired
4342
import org.springframework.http.HttpStatus.ACCEPTED
4443
import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
4544
import org.springframework.http.ResponseEntity
@@ -52,7 +51,7 @@ import reactor.core.publisher.Mono
5251
@Tag(name = "Feature", description = "The API for feature related operations")
5352
@RestController
5453
@RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_STORE$RESOURCE_FEATURES/$PATH_PARAM_UID"])
55-
class FeatureResource(@Autowired val featureServices: FeatureServices) {
54+
class FeatureResource(val featureServices: FeatureServices) {
5655

5756
@Operation(summary = "Get feature by uid", description = "Get feature by uid", tags = ["Feature"])
5857
@ApiResponses(

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import org.ff4j.services.domain.FeatureApiBean
3636
import org.ff4j.services.domain.FeatureStoreApiBean
3737
import org.ff4j.services.domain.GroupDescApiBean
3838
import org.ff4j.web.FF4jWebConstants.*
39-
import org.springframework.beans.factory.annotation.Autowired
4039
import org.springframework.http.HttpStatus.NO_CONTENT
4140
import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
4241
import org.springframework.http.ResponseEntity
@@ -53,7 +52,7 @@ import reactor.core.publisher.Mono
5352
@Tag(name = "FeatureStore", description = "The API for accessing the store of all features")
5453
@RestController
5554
@RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_STORE"])
56-
class FeatureStoreResource(@Autowired val featureStoreService: FeatureStoreServices) {
55+
class FeatureStoreResource(val featureStoreService: FeatureStoreServices) {
5756

5857
@Operation(summary = "Displays information regarding the FeaturesStore", tags = ["FeatureStore"])
5958
@ApiResponses(

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import org.ff4j.services.constants.FeatureConstants.RESOURCE_STORE
3535
import org.ff4j.services.domain.FeatureApiBean
3636
import org.ff4j.web.FF4jWebConstants.OPERATION_DISABLE
3737
import org.ff4j.web.FF4jWebConstants.OPERATION_ENABLE
38-
import org.springframework.beans.factory.annotation.Autowired
3938
import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
4039
import org.springframework.http.ResponseEntity
4140
import org.springframework.web.bind.annotation.*
@@ -47,7 +46,7 @@ import reactor.core.publisher.Flux
4746
@Tag(name = "Groups", description = "The API for group related operations")
4847
@RestController
4948
@RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_STORE$RESOURCE_GROUPS/$PATH_PARAM_GROUP"])
50-
class GroupResource(@Autowired val groupServices: GroupServices) {
49+
class GroupResource(val groupServices: GroupServices) {
5150

5251
@Operation(summary = "Get all the features belonging to the group", tags = ["Groups"])
5352
@ApiResponses(

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import org.ff4j.services.constants.FeatureConstants.RESOURCE_MONITORING
3232
import org.ff4j.services.domain.EventRepositoryApiBean
3333
import org.ff4j.web.FF4jWebConstants.PARAM_END
3434
import org.ff4j.web.FF4jWebConstants.PARAM_START
35-
import org.springframework.beans.factory.annotation.Autowired
3635
import org.springframework.http.MediaType.APPLICATION_JSON_VALUE
3736
import org.springframework.http.ResponseEntity
3837
import org.springframework.web.bind.annotation.GetMapping
@@ -47,7 +46,7 @@ import reactor.core.publisher.Mono
4746
@Tag(name = "Monitoring", description = "The API for monitoring related operations")
4847
@RestController
4948
@RequestMapping(value = ["\${ff4j.api.context-path:$RESOURCE_FF4J}$RESOURCE_MONITORING"])
50-
class MonitoringResource(@Autowired val monitoringServices: MonitoringServices) {
49+
class MonitoringResource(val monitoringServices: MonitoringServices) {
5150

5251
@Operation(
5352
summary = "Display Monitoring information for all features",

0 commit comments

Comments
 (0)