Skip to content

Commit a3234eb

Browse files
authored
Merge pull request #710 from iExecBlockchainComputing/release/8.5.0
Release/8.5.0
2 parents 2935a0c + cc6bdb0 commit a3234eb

75 files changed

Lines changed: 1490 additions & 798 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,46 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [[8.5.0]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.5.0) 2024-06-19
6+
7+
### Deprecation Notices
8+
9+
- Deprecate legacy task feedback API endpoints. (#701)
10+
11+
### New Features
12+
13+
- Create `iexec-task-api` to access task feedback API. (#695)
14+
- Move `notification` package from `iexec-commons-poco` to `iexec-core-library`. (#697 #698)
15+
- Move `PublicConfiguration` class from `iexec-common` to `iexec-core-library`. (#699)
16+
- Create `ConfigServerClient` instance and use it. (#700)
17+
- Allow up to 32 task updates at a given time. (#703)
18+
- Index `currentStatus` field in `task` collection. (#707)
19+
- Replace `CredentialsService` with `SignerService`. (#708)
20+
21+
### Bug Fixes
22+
23+
- Always use `WorkerpoolAuthorization` to retrieve JWT and check result upload on Result Proxy. (#690)
24+
- Use correct `Signature` import in `SchedulerClient`. (#697)
25+
- Do not supply replicates past their contribution deadline to workers. (#702)
26+
- Query blockchain adapter every 2s instead of every second. (#706)
27+
28+
### Quality
29+
30+
- Configure Gradle JVM Test Suite Plugin. (#691)
31+
- Rename `IexecTaskApiClient` to `TaskApiClient`. (#696)
32+
- Move `ReplicateTaskSummary` from `iexec-common` to `iexec-core`. (#704 #705)
33+
34+
### Dependency Upgrades
35+
36+
- Upgrade to Gradle 8.7. (#692)
37+
- Upgrade to `eclipse-temurin:11.0.22_7-jre-focal`. (#693)
38+
- Upgrade to Spring Boot 2.7.18. (#694)
39+
- Upgrade to `iexec-commons-poco` 4.1.0. (#709)
40+
- Upgrade to `iexec-common` 8.5.0. (#709)
41+
- Upgrade to `iexec-blockchain-adapter-api-library` 8.5.0. (#709)
42+
- Upgrade to `iexec-result-proxy-library` 8.5.0. (#709)
43+
- Upgrade to `iexec-sms-library` 8.6.0. (#709)
44+
545
## [[8.4.1]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.4.1) 2024-04-03
646

747
### New Features

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:11.0.21_9-jre-focal
1+
FROM eclipse-temurin:11.0.22_7-jre-focal
22

33
ARG jar
44

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ To run properly, the _iExec Core Scheduler_ requires:
1515
* An _iExec Blockchain Adapter_ for several blockchain network interactions.
1616
* An _iExec Result Proxy_ to check if tasks results have been published.
1717
* An _iExec Platform Registry_ to retrieve locations of _iExec SMS_ services.
18+
* An _iExec Config Server_ to retrieve configuration about blockchain.
1819
* One or many _iExec Secret Management Service_ instances (referenced by the _iExec Platform Registry_) to handle secrets and enclave sessions of TEE tasks.
1920

2021
You can configure the _iExec Core Scheduler_ with the following properties:
@@ -43,6 +44,9 @@ You can configure the _iExec Core Scheduler_ with the following properties:
4344
| `IEXEC_CORE_CHAIN_ADAPTER_PORT` | _iExec Blockchain Adapter_ server port. | Positive integer | `13010` |
4445
| `IEXEC_CORE_CHAIN_ADAPTER_USERNAME` | Username to connect to the _iExec Blockchain Adapter_ server. | String | `admin` |
4546
| `IEXEC_CORE_CHAIN_ADAPTER_PASSWORD` | Password to connect to the _iExec Blockchain Adapter_ server. | String | `whatever` |
47+
| `IEXEC_CONFIG_SERVER_PROTOCOL` | _iExec Config Server_ communication protocol. | String | `http` |
48+
| `IEXEC_CONFIG_SERVER_HOST` | _iExec Config Server_ host. | String | `localhost` |
49+
| `IEXEC_CONFIG_SERVER_PORT` | _iExec Config Server_ port. | Positive integer | `8888` |
4650
| `IEXEC_CHAIN_HEALTH_POLLING_INTERVAL_IN_BLOCKS` | Polling interval (in blocks) on the blockchain to check this _Scheduler_ can communicate with it. | Positive integer | 3 |
4751
| `IEXEC_CHAIN_HEALTH_OUT_OF_SERVICE_THRESHOLD` | Max number of consecutive failures of blockchain connection attempts before this _Scheduler_ is declared as OUT-OF-SERVICE. | Positive integer | 4 |
4852
| `IEXEC_RESULT_REPOSITORY_PROTOCOL` | _iExec Result Proxy_ server communication protocol. | String | `http` |

build.gradle

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
22
id 'java'
3-
id 'io.freefair.lombok' version '8.2.2'
4-
id 'org.springframework.boot' version '2.7.17'
3+
id 'io.freefair.lombok' version '8.6'
4+
id 'org.springframework.boot' version '2.7.18'
55
id 'io.spring.dependency-management' version '1.1.4'
66
id 'jacoco'
7-
id 'org.sonarqube' version '4.2.1.3168'
7+
id 'org.sonarqube' version '5.0.0.4638'
88
id 'maven-publish'
99
}
1010

@@ -59,6 +59,7 @@ dependencies {
5959
implementation "com.iexec.result-proxy:iexec-result-proxy-library:$iexecResultVersion"
6060
implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion"
6161
implementation project(':iexec-core-library')
62+
implementation project(':iexec-task-api')
6263

6364
// spring
6465
implementation "org.springframework.boot:spring-boot-starter"
@@ -99,22 +100,6 @@ dependencies {
99100

100101
// vavr
101102
implementation 'io.vavr:vavr:0.10.4'
102-
103-
// tests
104-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
105-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
106-
107-
// awaitility
108-
testImplementation 'org.awaitility:awaitility'
109-
110-
// mongo
111-
testImplementation "org.testcontainers:junit-jupiter:$testContainersVersion"
112-
testImplementation "org.testcontainers:mongodb:$testContainersVersion"
113-
}
114-
115-
jar {
116-
enabled = true
117-
archiveClassifier.set('library')
118103
}
119104

120105
springBoot {
@@ -128,8 +113,26 @@ tasks.named("bootJar") {
128113
}
129114
}
130115

131-
test {
132-
useJUnitPlatform()
116+
testing {
117+
suites {
118+
test {
119+
useJUnitJupiter()
120+
dependencies {
121+
implementation 'org.springframework.boot:spring-boot-starter-test'
122+
123+
// awaitility
124+
implementation 'org.awaitility:awaitility'
125+
126+
// mongo
127+
implementation "org.testcontainers:junit-jupiter:$testContainersVersion"
128+
implementation "org.testcontainers:mongodb:$testContainersVersion"
129+
}
130+
}
131+
}
132+
}
133+
134+
tasks.withType(Test).configureEach {
135+
finalizedBy jacocoTestReport
133136
systemProperty "mongo.image", "mongo:4.4.28-focal"
134137
}
135138

@@ -144,7 +147,6 @@ jacocoTestReport {
144147
xml.required = true
145148
}
146149
}
147-
tasks.test.finalizedBy tasks.jacocoTestReport
148150
tasks.sonarqube.dependsOn tasks.jacocoTestReport
149151

150152
publishing {

gradle.properties

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
version=8.4.1
2-
iexecCommonVersion=8.4.0
3-
iexecCommonsPocoVersion=3.2.0
4-
iexecBlockchainAdapterVersion=8.4.0
5-
iexecResultVersion=8.4.0
6-
iexecSmsVersion=8.5.1
7-
1+
version=8.5.0
2+
iexecCommonVersion=8.5.0
3+
iexecCommonsPocoVersion=4.1.0
4+
iexecBlockchainAdapterVersion=8.5.0
5+
iexecResultVersion=8.5.0
6+
iexecSmsVersion=8.6.0
87
nexusUser
98
nexusPassword

gradle/wrapper/gradle-wrapper.jar

-19.5 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

iexec-core-library/build.gradle

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ plugins {
88
dependencies {
99
implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
1010
implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
11-
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
12-
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
11+
// TODO remove this later when migration has been done
12+
implementation project(':iexec-task-api')
1313
}
1414

1515
java {
@@ -19,10 +19,20 @@ java {
1919
withSourcesJar()
2020
}
2121

22+
testing {
23+
suites {
24+
test {
25+
useJUnitJupiter()
26+
dependencies {
27+
implementation 'org.junit.jupiter:junit-jupiter:5.8.2'
28+
implementation 'org.assertj:assertj-core:3.22.0'
29+
}
30+
}
31+
}
32+
}
2233

2334
tasks.withType(Test).configureEach {
2435
finalizedBy tasks.jacocoTestReport
25-
useJUnitPlatform()
2636
}
2737

2838
// sonarqube code coverage requires jacoco XML report
@@ -44,7 +54,7 @@ publishing {
4454
username nexusUser
4555
password nexusPassword
4656
}
47-
url = project.hasProperty("nexusUrl")? project.nexusUrl: ''
57+
url = project.hasProperty("nexusUrl") ? project.nexusUrl : ''
4858
}
4959
}
5060
}

0 commit comments

Comments
 (0)