Merge pull request #147 from iExecBlockchainComputing/release/8.6.0

Release 8.6.0

Author: Natchica

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.6.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.6.0) 2024-12-20
+
+### Quality
+
+- Keep `itest` task empty in `build.gradle` to avoid a warning during build. (#145)
+
+### Dependency Upgrades
+
+- Upgrade to `eclipse-temurin:11.0.24_8-jre-focal`. (#141)
+- Upgrade to Gradle 8.10.2. (#142)
+- Upgrade to `testcontainers` 1.20.4. (#143)
+- Upgrade to `mongo:7.0.15-jammy`. (#144)
+- Upgrade to `iexec-commons-poco` 4.2.0. (#146)
+- Upgrade to `iexec-common` 8.6.0. (#146)
+
 ## [[8.5.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.5.0) 2024-06-18
 
 ### New Features
@@ -22,7 +37,7 @@ All notable changes to this project will be documented in this file.
 - Upgrade to `eclipse-temurin:11.0.22_7-jre-focal`. (#135)
 - Upgrade to Spring Boot 2.7.18. (#136)
 - Upgrade to `iexec-commons-poco` 4.1.0. (#138)
-- Upgrade to `iexce-common` 8.5.0. (#138)
+- Upgrade to `iexec-common` 8.5.0. (#138)
 
 ## [[8.4.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.4.0) 2024-02-29
 

Dockerfile

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

build.gradle

@@ -1,17 +1,16 @@
 plugins {
     id 'java'
-    id 'io.freefair.lombok' version '8.6'
+    id 'io.freefair.lombok' version '8.10.2'
     id 'org.springframework.boot' version '2.7.18'
-    id 'io.spring.dependency-management' version '1.1.4'
+    id 'io.spring.dependency-management' version '1.1.6'
     id 'jacoco'
-    id 'org.sonarqube' version '5.0.0.4638'
+    id 'org.sonarqube' version '5.1.0.4882'
     id 'maven-publish'
 }
 
 ext {
-    springCloudVersion = '2021.0.8'
     jjwtVersion = '0.11.5'
-    testContainersVersion = '1.19.3'
+    testContainersVersion = '1.20.4'
 }
 
 if (!project.hasProperty('gitBranch')) {
@@ -55,8 +54,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
     implementation "org.springframework.retry:spring-retry"
+    // required for spring-retry
+    runtimeOnly 'org.aspectj:aspectjweaver'
 
     // observability
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
@@ -76,12 +76,6 @@ dependencies {
     implementation 'net.jodah:expiringmap:0.5.10'
 }
 
-dependencyManagement {
-    imports {
-        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
-    }
-}
-
 springBoot {
     buildInfo()
 }
@@ -108,10 +102,10 @@ testing {
 
 tasks.withType(Test).configureEach {
     finalizedBy jacocoTestReport
-    systemProperty "mongo.image", "mongo:4.4.28-focal"
+    systemProperty "mongo.image", "mongo:7.0.15-jammy"
 }
 
-tasks.register('itest', Test) {
+tasks.register('itest') {
     group 'Verification'
     description 'Runs the integration tests.'
 }

gradle.properties

@@ -1,6 +1,6 @@
-version=8.5.0
-iexecCommonVersion=8.5.0
-iexecCommonsPocoVersion=4.1.0
+version=8.6.0
+iexecCommonVersion=8.6.0
+iexecCommonsPocoVersion=4.2.0
 
 nexusUser
 nexusPassword

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -27,8 +27,9 @@
 import com.iexec.resultproxy.chain.IexecHubService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
 import org.springframework.test.context.DynamicPropertyRegistry;
@@ -59,6 +60,7 @@
 
 @DataMongoTest
 @Testcontainers
+@ExtendWith(MockitoExtension.class)
 class AuthorizationServiceTests {
 
     private static final String RESULT_DIGEST = "0x3210";
@@ -84,7 +86,6 @@ static void registerProperties(DynamicPropertyRegistry registry) {
 
     @BeforeEach
     void beforeEach() throws GeneralSecurityException {
-        MockitoAnnotations.openMocks(this);
         enclaveCreds = Credentials.create(Keys.createEcKeyPair());
         workerCreds = Credentials.create(Keys.createEcKeyPair());
         authorizationRepository.deleteAll();
@@ -135,7 +136,6 @@ void shouldNotBeAuthorizedOnExecutionOfTeeTaskWhenTaskTypeNotMatchedOnchainWithD
     @Test
     void shouldNotBeAuthorizedOnExecutionOfTeeTaskWhenGetTaskFailedWithDetails() {
         final WorkerpoolAuthorization auth = getWorkerpoolAuthorization(true);
-        when(iexecHubService.isTeeTask(auth.getChainTaskId())).thenReturn(true);
         when(iexecHubService.getChainTask(auth.getChainTaskId())).thenReturn(Optional.empty());
 
         Optional<AuthorizationError> isAuth = authorizationService.isAuthorizedOnExecutionWithDetailedIssue(auth);
@@ -149,7 +149,6 @@ void shouldNotBeAuthorizedOnExecutionOfTeeTaskWhenFinalDeadlineReached() {
                 .dealid(CHAIN_DEAL_ID)
                 .finalDeadline(Instant.now().minus(5L, ChronoUnit.SECONDS).toEpochMilli())
                 .build();
-        when(iexecHubService.isTeeTask(auth.getChainTaskId())).thenReturn(true);
         when(iexecHubService.getChainTask(auth.getChainTaskId())).thenReturn(Optional.of(chainTask));
 
         Optional<AuthorizationError> isAuth = authorizationService.isAuthorizedOnExecutionWithDetailedIssue(auth);
@@ -162,7 +161,6 @@ void shouldNotBeAuthorizedOnExecutionOfTeeTaskWhenGetDealFailedWithDetails() {
         final WorkerpoolAuthorization auth = getWorkerpoolAuthorization(true);
         auth.setSignature(new Signature(POOL_WRONG_SIGNATURE));
 
-        when(iexecHubService.isTeeTask(auth.getChainTaskId())).thenReturn(true);
         when(iexecHubService.getChainTask(auth.getChainTaskId())).thenReturn(Optional.of(chainTask));
         when(iexecHubService.getChainDeal(chainTask.getDealid())).thenReturn(Optional.empty());