Skip to content
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

Upgrade to Java 17 #95

Merged
merged 3 commits into from
Jan 13, 2025
Merged

Upgrade to Java 17 #95

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29148b7
Upgrade to Java 17 and Spring Boot 3
Natchica Jan 7, 2025
6d0b8a5
Update CHANGELOG
Natchica Jan 7, 2025
d9da2ee
Clean dependencies use
Natchica Jan 7, 2025
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.

## [[NEXT]](https://github.com/iExecBlockchainComputing/tee-worker-pre-compute/releases/tag/vNEXT) 2025

### Dependency Upgrades

- Upgrade to `eclipse-temurin:17.0.13_11-jre-focal`. (#95)
- Upgrade to Spring Boot 3.0.13. (#95)

## [[8.6.0]](https://github.com/iExecBlockchainComputing/tee-worker-pre-compute/releases/tag/v8.6.0) 2024-12-20

### New Features
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:11.0.24_8-jre-focal
FROM eclipse-temurin:17.0.13_11-jre-focal

ARG jar

Expand Down
19 changes: 10 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ext {
ociImageName = ociImageBase + ':dev'
ociTeeImageName = ociImageBase + '-unlocked:dev'
jarPathForOCI = relativePath(tasks.shadowJar.outputs.files.singleFile)
mockitoVersion = '4.4.0'
springBootVersion = '3.0.13'
systemStubsVersion = '2.0.1'
}

Expand Down Expand Up @@ -50,20 +50,22 @@ 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"

// 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 {
Expand All @@ -75,13 +77,12 @@ testing {
test {
useJUnitJupiter()
dependencies {
implementation 'org.junit.jupiter:junit-jupiter:5.7.0'
implementation 'org.assertj:assertj-core:3.18.1'
implementation 'org.assertj:assertj-core'
implementation "org.mockito:mockito-core"
implementation "org.mockito:mockito-junit-jupiter"
implementation "org.mockito:mockito-inline" // activates mocking final classes/methods
jbern0rd marked this conversation as resolved.
Show resolved Hide resolved
implementation "uk.org.webcompere:system-stubs-core:$systemStubsVersion" // activates env var setting
implementation "uk.org.webcompere:system-stubs-jupiter:$systemStubsVersion" // activates env var setting
implementation "org.mockito:mockito-core:$mockitoVersion"
implementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
implementation "org.mockito:mockito-inline:$mockitoVersion" // activates mocking final classes/methods
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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