Skip to content

feat: upgrade to Spring Boot 3.5.8 #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbern0rd merged 1 commit into from
May 6, 2026
Merged

feat: upgrade to Spring Boot 3.5.8 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion iexec-blockchain-adapter-api-library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions src/itest/java/com/iexec/blockchain/IntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
28 changes: 0 additions & 28 deletions src/main/resources/logback-spring.xml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/test/java/com/iexec/blockchain/security/WebSecurityConfigurationAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand All @@ -38,7 +38,7 @@ class WebSecurityConfigurationAdapterTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private MongoTemplate mongoTemplate;

@Test
Expand Down
Loading