Upgrade to Java 17

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/tee-worker-post-compute/releases/tag/vNEXT) 2025
 
+### Dependency Upgrades
+
+- Upgrade to `eclipse-temurin:17.0.13_11-jre-focal`. (#124)
+- Upgrade to Spring Boot 3.0.13. (#124)
+
 ## [[8.6.0]](https://github.com/iExecBlockchainComputing/tee-worker-post-compute/releases/tag/v8.6.0) 2024-12-20
 
 ### New Features

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

@@ -14,7 +14,7 @@ ext {
     ociTeeImageName = ociImageBase + '-unlocked:dev'
     // versions
     testContainersVersion = '1.20.4'
-    mockitoVersion = '4.4.0'
+    springBootVersion = '3.0.13'
     systemStubsVersion = '2.0.1'
 }
 
@@ -40,6 +40,8 @@ repositories {
 }
 
 dependencies {
+    implementation platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
+
     // iexec
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
@@ -51,16 +53,16 @@ dependencies {
     implementation 'com.dropbox.core:dropbox-core-sdk:3.1.1'
 
     // Apache Commons-lang3
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.apache.commons:commons-lang3'
 
 }
 
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
     }
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType(Tar).configureEach {
@@ -70,27 +72,22 @@ tasks.withType(Tar).configureEach {
 testing {
     suites {
         configureEach {
+            useJUnitJupiter()
             dependencies {
-                implementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
+                implementation platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion")
+                implementation "org.mockito:mockito-junit-jupiter"
                 implementation "uk.org.webcompere:system-stubs-core:$systemStubsVersion"    // activates env var setting
                 implementation "uk.org.webcompere:system-stubs-jupiter:$systemStubsVersion" // activates env var setting
             }
         }
-        test {
-            useJUnitJupiter()
-            dependencies {
-                implementation 'org.junit.jupiter:junit-jupiter:5.8.2'
-                implementation "org.mockito:mockito-inline:$mockitoVersion" // activates mocking final classes/methods
-            }
-        }
         itest(JvmTestSuite) {
             dependencies {
                 implementation project()
                 implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
                 implementation 'com.github.tomakehurst:wiremock-jre8:2.28.1'
-                implementation 'org.awaitility:awaitility:4.1.1'
-                implementation "org.testcontainers:testcontainers:${testContainersVersion}"
-                implementation "org.testcontainers:junit-jupiter:${testContainersVersion}"
+                implementation 'org.awaitility:awaitility'
+                implementation "org.testcontainers:testcontainers:$testContainersVersion"
+                implementation "org.testcontainers:junit-jupiter:$testContainersVersion"
             }
         }
     }

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