From 6a05acae214d9c6f8c12f0143072d03e0abd8453 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Wed, 6 May 2026 09:27:58 +0200 Subject: [PATCH] feat: upgrade to Spring Boot 3.5.8 --- build.gradle | 6 ++-- .../build.gradle | 2 +- .../iexec/blockchain/IntegrationTests.java | 10 +++---- src/main/resources/logback-spring.xml | 28 ------------------- .../WebSecurityConfigurationAdapterTest.java | 6 ++-- 5 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 src/main/resources/logback-spring.xml diff --git a/build.gradle b/build.gradle index d9994cc4..dfa7a5d9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' id 'io.freefair.lombok' version '8.14.4' - id 'org.springframework.boot' version '3.3.8' - id 'io.spring.dependency-management' version '1.1.6' + id 'org.springframework.boot' version '3.5.8' + id 'io.spring.dependency-management' version '1.1.7' id 'jacoco' id 'org.sonarqube' version '6.3.1.5724' id 'maven-publish' @@ -55,7 +55,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' // Spring Doc - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.17' // iexec implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion" diff --git a/iexec-blockchain-adapter-api-library/build.gradle b/iexec-blockchain-adapter-api-library/build.gradle index e7d5f74a..c98f4ad3 100644 --- a/iexec-blockchain-adapter-api-library/build.gradle +++ b/iexec-blockchain-adapter-api-library/build.gradle @@ -6,7 +6,7 @@ plugins { } dependencies { - implementation platform('org.springframework.boot:spring-boot-dependencies:3.3.8') + implementation platform('org.springframework.boot:spring-boot-dependencies:3.5.8') implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion" implementation "com.iexec.common:iexec-common:$iexecCommonVersion" implementation 'org.apache.commons:commons-lang3' diff --git a/src/itest/java/com/iexec/blockchain/IntegrationTests.java b/src/itest/java/com/iexec/blockchain/IntegrationTests.java index 12fc687d..f6ec428b 100644 --- a/src/itest/java/com/iexec/blockchain/IntegrationTests.java +++ b/src/itest/java/com/iexec/blockchain/IntegrationTests.java @@ -302,7 +302,7 @@ private String triggerDeal(int taskVolume) throws IOException, TransactionExcept } private String buildRandomName(String baseName) { - return baseName + "-" + RandomStringUtils.randomAlphabetic(10); + return baseName + "-" + RandomStringUtils.secure().nextAlphabetic(10); } private boolean areTxMined(String... txHashes) { @@ -322,7 +322,7 @@ private AppOrder buildAppOrder(String appAddress, int volume) { .datasetrestrict(BytesUtils.EMPTY_ADDRESS) .workerpoolrestrict(BytesUtils.EMPTY_ADDRESS) .requesterrestrict(BytesUtils.EMPTY_ADDRESS) - .salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20))) + .salt(Hash.sha3String(RandomStringUtils.secure().nextAlphanumeric(20))) .build(); return (AppOrder) signerService.signOrderForDomain(appOrder, domain); } @@ -338,7 +338,7 @@ private WorkerpoolOrder buildWorkerpoolOrder(String workerpoolAddress, int volum .requesterrestrict(BytesUtils.EMPTY_ADDRESS) .apprestrict(BytesUtils.EMPTY_ADDRESS) .datasetrestrict(BytesUtils.EMPTY_ADDRESS) - .salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20))) + .salt(Hash.sha3String(RandomStringUtils.secure().nextAlphanumeric(20))) .build(); return (WorkerpoolOrder) signerService.signOrderForDomain(workerpoolOrder, domain); } @@ -352,7 +352,7 @@ private DatasetOrder buildDatasetOrder(String datasetAddress, int volume) { .apprestrict(BytesUtils.EMPTY_ADDRESS) .workerpoolrestrict(BytesUtils.EMPTY_ADDRESS) .requesterrestrict(BytesUtils.EMPTY_ADDRESS) - .salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20))) + .salt(Hash.sha3String(RandomStringUtils.secure().nextAlphanumeric(20))) .build(); return (DatasetOrder) signerService.signOrderForDomain(datasetOrder, domain); } @@ -378,7 +378,7 @@ private RequestOrder buildRequestOrder( .requester(requesterAddress) .callback(BytesUtils.EMPTY_ADDRESS) .params(dealParams.toJsonString()) - .salt(Hash.sha3String(RandomStringUtils.randomAlphanumeric(20))) + .salt(Hash.sha3String(RandomStringUtils.secure().nextAlphanumeric(20))) .build(); return (RequestOrder) signerService.signOrderForDomain(requestOrder, domain); } diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml deleted file mode 100644 index 411ed485..00000000 --- a/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/java/com/iexec/blockchain/security/WebSecurityConfigurationAdapterTest.java b/src/test/java/com/iexec/blockchain/security/WebSecurityConfigurationAdapterTest.java index db11dfcc..f270ce9e 100644 --- a/src/test/java/com/iexec/blockchain/security/WebSecurityConfigurationAdapterTest.java +++ b/src/test/java/com/iexec/blockchain/security/WebSecurityConfigurationAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2025 IEXEC BLOCKCHAIN TECH + * Copyright 2025-2026 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. @@ -22,9 +22,9 @@ import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -38,7 +38,7 @@ class WebSecurityConfigurationAdapterTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private MongoTemplate mongoTemplate; @Test