Merge pull request #81 from iExecBlockchainComputing/release/8.0.0

Release/8.0.0

Author: james-toussaint

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.0.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.0.0) 2023-03-03
+
+### New Features
+* Support Gramine framework for TEE tasks.
+* Add iExec banner at startup.
+* Show application version on banner.
+### Bug Fixes
+* Sign issued JWT tokens.
+* Fix JWT tokens flow.
+### Quality
+* Clean controllers.
+### 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 `java-http-ipfs-client` to 1.4.0 for latest IPFS Kubo support (v0.18.1).
+* Upgrade `jjwt` to `jjwt-api` 0.11.5.
+* Upgrade to `iexec-common` 7.0.0.
+* Upgrade to `jenkins-library` 2.4.0.
+
 ## [[7.3.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v7.3.0) 2023-01-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

@@ -17,19 +17,17 @@ You can configure the iExec Result Proxy with the following properties:
 
 | Environment variable | Description | Type | Default value |
 | --- | --- | --- | --- |
-| IEXEC_RESULT_PROXY_PORT | Server HTTP port of the result proxy. | Positive integer | `13200` |
-| MONGO_HOST | Mongo server host. Cannot be set with URI. | String | `localhost` |
-| MONGO_PORT | Mongo server port. Cannot be set with URI. | Positive integer | `13202` |
-| IEXEC_CHAIN_ID | Chain ID of the blockchain network to connect. | Integer | `17` |
-| IEXEC_IS_SIDECHAIN | Define if iExec on-chain protocol is built on top of token (`false`) or native currency (`true`). | Boolean | `false` |
-| IEXEC_PRIVATE_CHAIN_ADDRESS | Private URL to connect to the blockchain node. | URL | `http://localhost:8545` |
-| IEXEC_PUBLIC_CHAIN_ADDRESS | [unused] Public URL to connect to the blockchain node. | URL | `http://localhost:8545` |
-| IEXEC_HUB_ADDRESS | Proxy contract address to interact with the iExec on-chain protocol. | Ethereum address | `0xBF6B2B07e47326B7c8bfCb4A5460bef9f0Fd2002` |
-| IEXEC_START_BLOCK_NUMBER | [Unused] | Positive integer | `0` |
-| IEXEC_GAS_PRICE_MULTIPLIER | Transactions will be sent with `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER`. | Float | `1.0` |
-| IEXEC_GAS_PRICE_CAP | In Wei, will be used for transactions if `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER > gasPriceCap`. | Integer | `22000000000` |
-| IEXEC_IPFS_HOST | Host to connect to the IPFS node. | String | `127.0.0.1` |
-| IEXEC_IPFS_PORT | Server port of the IPFS node. | Positive integer | `5001` |
+| `IEXEC_RESULT_PROXY_PORT` | Server HTTP port of the result proxy. | Positive integer | `13200` |
+| `MONGO_HOST` | Mongo server host. Cannot be set with URI. | String | `localhost` |
+| `MONGO_PORT` | Mongo server port. Cannot be set with URI. | Positive integer | `13202` |
+| `IEXEC_CHAIN_ID` | Chain ID of the blockchain network to connect. | `Integer | `17` |
+| `IEXEC_IS_SIDECHAIN` | Define if iExec on-chain protocol is built on top of token (`false`) or native currency (`true`). | Boolean | `false` |
+| `IEXEC_PRIVATE_CHAIN_ADDRESS` | Private URL to connect to the blockchain node. | URL | `http://localhost:8545` |
+| `IEXEC_HUB_ADDRESS` | Proxy contract address to interact with the iExec on-chain protocol. | Ethereum address | `0xBF6B2B07e47326B7c8bfCb4A5460bef9f0Fd2002` |
+| `IEXEC_GAS_PRICE_MULTIPLIER` | Transactions will be sent with `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER`. | Float | `1.0` |
+| `IEXEC_GAS_PRICE_CAP` | In Wei, will be used for transactions if `networkGasPrice * IEXEC_GAS_PRICE_MULTIPLIER > gasPriceCap`. | Integer | `22000000000` |
+| `IEXEC_IPFS_HOST` | Host to connect to the IPFS node. | String | `127.0.0.1` |
+| `IEXEC_IPFS_PORT` | Server port of the IPFS node. | Positive integer | `5001` |
 
 ## Health checks
 

build.gradle

@@ -1,15 +1,16 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.6.2'
-    id 'io.spring.dependency-management' version '1.0.9.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'
 }
 
 ext {
-    springCloudVersion = '2021.0.0'
+    springCloudVersion = '2021.0.5'
+    jjwtVersion = '0.11.5'
 }
 
 if (!project.hasProperty('gitBranch')) {
@@ -18,13 +19,9 @@ if (!project.hasProperty('gitBranch')) {
 
 allprojects {
     group = 'com.iexec.result-proxy'
-    sourceCompatibility = 11
-    targetCompatibility = 11
-
     if (gitBranch != 'main' && gitBranch != 'master' && !(gitBranch ==~ '(release|hotfix|support)/.*')) {
         version += '-NEXT-SNAPSHOT'
     }
-
     repositories {
         mavenLocal()
         mavenCentral()
@@ -42,11 +39,10 @@ allprojects {
             url 'https://jitpack.io'
         }
     }
-}
-
-configurations {
-    compileOnly {
-        extendsFrom annotationProcessor
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(11))
+        }
     }
 }
 
@@ -55,8 +51,10 @@ dependencies {
     implementation "com.iexec.common:iexec-common:${iexecCommonVersion}"
 
     // 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
 
     // spring
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
@@ -72,18 +70,16 @@ dependencies {
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.mockito:mockito-inline:2.13.0' // activates mocking final classes/methods
 
-    // lombok
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-
     // Spring Doc
     implementation 'org.springdoc:springdoc-openapi-ui:1.6.3'
 
     // ipfs
-    implementation 'com.github.ipfs:java-ipfs-http-client:1.3.3'
+    implementation 'com.github.ipfs:java-ipfs-http-client:1.4.0'
 
     // json web token
-    implementation 'io.jsonwebtoken:jjwt:0.7.0'
+    implementation "io.jsonwebtoken:jjwt-api:$jjwtVersion"
+    runtimeOnly "io.jsonwebtoken:jjwt-impl:$jjwtVersion"
+    runtimeOnly "io.jsonwebtoken:jjwt-jackson:$jjwtVersion"
 
     // expiring map
     implementation 'net.jodah:expiringmap:0.5.8'
@@ -99,6 +95,13 @@ springBoot {
     buildInfo()
 }
 
+tasks.named("bootJar") {
+    manifest {
+        attributes("Implementation-Title": "iExec Result Proxy",
+                   "Implementation-Version": project.version)
+    }
+}
+
 test {
     useJUnitPlatform()
 }
@@ -116,7 +119,7 @@ jacoco {
 // sonarqube code coverage requires jacoco XML report
 jacocoTestReport {
     reports {
-        xml.enabled true
+        xml.required = true
     }
 }
 tasks.test.finalizedBy    tasks.jacocoTestReport
@@ -125,7 +128,7 @@ tasks.sonarqube.dependsOn tasks.jacocoTestReport
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact bootJar
+            artifact tasks.named("bootJar")
             from components.java
         }
     }

gradle.properties

@@ -1,5 +1,5 @@
-version=7.3.0
-iexecCommonVersion=6.0.0
+version=8.0.0
+iexecCommonVersion=7.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