Upgrade to Java 17 (#149)

Author: nabil-Tounarti

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/vNEXT) 2025
 
+### Dependency Upgrades
+
+- Upgrade to `eclipse-temurin:17.0.13_11-jre-focal`. (#149)
+- Upgrade to Spring Boot 3.0.13. (#149)
+- Upgrade to Spring Doc OpenAPI 2.6.0. (#149)
+
 ## [[8.6.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.6.0) 2024-12-20
 
 ### Quality

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.24_8-jre-focal
+FROM eclipse-temurin:17.0.13_11-jre-focal
 
 ARG jar
 

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'io.freefair.lombok' version '8.10.2'
-    id 'org.springframework.boot' version '2.7.18'
+    id 'org.springframework.boot' version '3.0.13'
     id 'io.spring.dependency-management' version '1.1.6'
     id 'jacoco'
     id 'org.sonarqube' version '5.1.0.4882'
@@ -40,8 +40,8 @@ allprojects {
         toolchain {
             languageVersion.set(JavaLanguageVersion.of(17))
         }
-        sourceCompatibility = "11"
-        targetCompatibility = "11"
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 
@@ -62,7 +62,7 @@ dependencies {
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 
     // Spring Doc
-    implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
 
     // ipfs
     implementation 'com.github.ipfs:java-ipfs-http-client:1.4.0'

gradle.properties

@@ -1,6 +1,6 @@
 version=8.6.0
-iexecCommonVersion=8.6.0
-iexecCommonsPocoVersion=4.2.0
+iexecCommonVersion=8.6.0-NEXT-SNAPSHOT
+iexecCommonsPocoVersion=4.2.0-NEXT-SNAPSHOT
 
 nexusUser
 nexusPassword

iexec-result-proxy-library/build.gradle

@@ -6,13 +6,14 @@ plugins {
 }
 
 dependencies {
+    implementation platform('org.springframework.boot:spring-boot-dependencies:3.0.13')
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
 }
 
 java {
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withJavadocJar()
     withSourcesJar()
 }
@@ -21,9 +22,6 @@ testing {
     suites {
         test {
             useJUnitJupiter()
-            dependencies {
-                implementation 'org.junit.jupiter:junit-jupiter:5.8.2'
-            }
         }
     }
 }

src/main/java/com/iexec/resultproxy/chain/ChainConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,10 @@
 
 import lombok.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 
 import java.time.Duration;
 
 @Value
-@ConstructorBinding
 @ConfigurationProperties(prefix = "chain")
 //TODO: validate configuration property names and use the same set of names everywhere (blockchain-adapter-api, sms)
 public class ChainConfig {

src/main/java/com/iexec/resultproxy/ipfs/IpfsConfig.java

@@ -2,10 +2,8 @@
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 
 @Data
-@ConstructorBinding
 @ConfigurationProperties(prefix = "ipfs")
 public class IpfsConfig {
     private final String host;

src/main/java/com/iexec/resultproxy/jwt/JwtConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 IEXEC BLOCKCHAIN TECH
+ * Copyright 2022-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,8 @@
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.ConstructorBinding;
 
 @Data
-@ConstructorBinding
 @ConfigurationProperties(prefix = "jwt")
 public class JwtConfig {
     private final String keyPath;

src/main/java/com/iexec/resultproxy/version/VersionController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2023-2025 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,12 @@
 
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.Metrics;
+import jakarta.annotation.PostConstruct;
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.PostConstruct;
-
 @RestController
 public class VersionController {