Merge pull request #510 from iExecBlockchainComputing/release/8.0.0

Release/8.0.0

Author: james-toussaint

CHANGELOG.md

@@ -2,6 +2,36 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.0.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.0.0) 2023-03-08
+
+### New Features
+* Support Gramine framework for TEE tasks.
+* Bind SMS URL to task.
+* Show application version on banner.
+### Bug Fixes
+* Remove dataset decryption non-TEE workflow.
+* Purge result files and metadata when task is completed.
+* On _iExec Core Scheduler_ REST call failure, only try to log in once to avoid nested retry loops.
+* Update iconarchive RLC PNG hash in tests.
+* Do not try to send heartbeat more than scheduled on _iExec Core Scheduler_.
+* Only try to log in once when the _iExec Core Scheduler_ returns __401 Unauthorized__ HTTP status code.
+* Wait for the application to be started before creating STOMP session.
+* Wait for the STOMP session to be ready before sending any replicate status update.
+* Do not call `isSgxSupported` when `SgxDriverMode.NONE`.
+* Remove duplicated calls to `IexecHubService#getTaskDescription` in `TaskManagerService`.
+* Refactor update replicate status call.
+### Quality
+* Improve code quality.
+* Extract STOMP client configuration to its own bean.
+* Remove unchecked casts.
+### Dependency Upgrades
+* Replace the deprecated `openjdk` Docker base image with `eclipse-temurin` and upgrade to Java 11.0.18 patch.
+* Upgrade to Spring Boot 2.6.14.
+* Upgrade to Gradle 7.6.
+* Upgrade OkHttp to 4.9.0.
+* Upgrade to `iexec-common` 7.0.0.
+* Upgrade to `jenkins-library` 2.4.0.
+
 ## [[7.3.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v7.3.0) 2022-12-18
 
 * Add endpoint to allow health checks.

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11.0.15-jre-slim
+FROM eclipse-temurin:11.0.18_10-jre
 
 ARG jar
 

Jenkinsfile

@@ -1,4 +1,4 @@
-@Library('global-jenkins-library@2.2.3') _
+@Library('global-jenkins-library@2.4.0') _
 buildJavaProject(
         buildInfo: getBuildInfo(),
         integrationTestsEnvVars: [],

README.md

@@ -5,6 +5,11 @@
 The _iExec Worker_ participates in a workerpool by computing tasks purchased by requesters on the iExec marketplace.
 The _iExec Worker_ must connect to the _iExec Core Scheduler_ of the workerpool to actively participate in the computation.
 
+After registration, the _iExec Worker_ sends a signal to the _iExec Core Scheduler_ at a fixed rate.
+This signal is used to let the _iExec Core Scheduler_ be aware of the _iExec Worker_ liveness.
+At the moment, the rate is fixed and this signal is sent every 10 seconds.
+The _iExec Worker_ will be considered as lost after several failures.
+
 The _iExec Worker_ is available as an OCI image on [Docker Hub](https://hub.docker.com/r/iexechub/iexec-worker/tags).
 
 ## Configuration

build.gradle

@@ -1,19 +1,17 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.6.2'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-    id 'eclipse'
+    id 'io.freefair.lombok' version '6.6.1'
+    id 'org.springframework.boot' version '2.6.14'
+    id 'io.spring.dependency-management' version '1.1.0'
     id 'jacoco'
     id 'org.sonarqube' version '3.3'
     id 'maven-publish'
 }
 
 group = 'com.iexec.worker'
-sourceCompatibility = 11
-targetCompatibility = 11
 
 ext {
-    springCloudVersion = '2021.0.0'
+    springCloudVersion = '2021.0.5'
     dockerJavaVersion = '3.2.12'
     lombokVersion = '1.18.2'
 }
@@ -79,14 +77,19 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-test"
     testImplementation "org.mockito:mockito-inline:4.8.0" // activates mocking final classes/methods
 
+    // apache commons.lang3
+    implementation 'org.apache.commons:commons-lang3'
+
     // Web3j issues, see core build.gradle
-    implementation 'com.squareup.okhttp3:okhttp:4.3.1'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.50'
+    // NoSuchMethodError: 'okhttp3.RequestBody okhttp3.RequestBody.create(java.lang.String, okhttp3.MediaType)'
+    // Spring Boot dependencies BOM enforces okhttp3 3.14.9 in 2.6.X
+    // It is required to define the dependency version required by web3j until migration to at least Spring Boot 2.7.X
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0' // Web3j issue: https://github.com/web3j/web3j/issues/1180
 
     // Required for com.iexec.worker.feign.config.RestTemplateConfig
-    implementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    implementation 'org.apache.httpcomponents:httpclient'
 
-    implementation 'org.glassfish.jersey.inject:jersey-hk2:2.26'
+    implementation 'org.glassfish.jersey.inject:jersey-hk2'
     implementation 'org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1'
     implementation 'javax.activation:activation:1.1.1'
 
@@ -96,12 +99,6 @@ dependencies {
     //graylog
     implementation 'biz.paluch.logging:logstash-gelf:1.5.1'
 
-    // lombok
-    compileOnly "org.projectlombok:lombok:${lombokVersion}"
-    annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
-    testCompileOnly "org.projectlombok:lombok:${lombokVersion}"
-    testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
-
     // docker
     implementation "com.github.docker-java:docker-java:${dockerJavaVersion}"
 
@@ -112,6 +109,12 @@ dependencies {
     testImplementation "org.awaitility:awaitility:4.2.0"
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
+
 // ./gradlew build -Pdev
 def isDev = project.hasProperty('dev')
 
@@ -124,6 +127,13 @@ springBoot {
     buildInfo()
 }
 
+tasks.named("bootJar") {
+    manifest {
+        attributes("Implementation-Title": "iExec Worker",
+                   "Implementation-Version": project.version)
+    }
+}
+
 test {
     useJUnitPlatform {
         // Ignore slow tests in development
@@ -144,7 +154,7 @@ jacoco {
 // sonarqube code coverage requires jacoco XML report
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.required = true
     }
 }
 tasks.test.finalizedBy    tasks.jacocoTestReport
@@ -153,7 +163,7 @@ tasks.sonarqube.dependsOn tasks.jacocoTestReport
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact bootJar
+            artifact tasks.named("bootJar")
             from components.java
         }
     }

gradle.properties

@@ -1,8 +1,8 @@
-version=7.3.0
-iexecCommonVersion=6.1.0
-iexecBlockchainAdapterVersion=7.3.0
-iexecResultVersion=7.3.0
-iexecSmsVersion=7.3.0
+version=8.0.0
+iexecCommonVersion=7.0.0
+iexecBlockchainAdapterVersion=8.0.0
+iexecResultVersion=8.0.0
+iexecSmsVersion=8.0.0
 
 nexusUser
 nexusPassword

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists