Merge pull request #104 from iExecBlockchainComputing/release/8.2.0

Release/8.2.0

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.2.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.2.0) 2023-09-28
+
+### New Features
+- Remove `nexus.intra.iex.ec` repository. (#94)
+- Check result hash before uploading. (#101)
+### Bug Fixes
+- Fix and harmonize `Dockerfile entrypoint` in all Spring Boot applications. (#98)
+- Describe upload limits configuration in README.md. (#99)
+### Quality
+- Upgrade to Gradle 8.2.1 with up-to-date plugins. (#97)
+- Remove `VersionService#isSnapshot`. (#103)
+### Dependency Upgrades
+- Upgrade to `eclipse-temurin` 11.0.20. (#95)
+- Upgrade to Spring Boot 2.7.14. (#96)
+- Upgrade to Spring Dependency Management Plugin 1.1.3. (#96)
+- Upgrade to `jenkins-library` 2.7.3. (#100)
+- Upgrade to `iexec-common` 8.3.0. (#102)
+- Upgrade to `iexec-common-poco` 3.1.0. (#102)
+
 ## [[8.1.1]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.1.1) 2023-06-23
 
 ### Dependency Upgrades

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.18_10-jre
+FROM eclipse-temurin:11.0.20_8-jre-focal
 
 ARG jar
 
@@ -12,4 +12,4 @@ COPY $jar iexec-result-proxy.jar
 
 # For Spring-Boot project, use the entrypoint
 # below to reduce Tomcat startup time.
-ENTRYPOINT exec java -Djava.security.egd=file:/dev/./urandom -jar iexec-result-proxy.jar
+ENTRYPOINT [ "java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "iexec-result-proxy.jar" ]

Jenkinsfile

@@ -1,11 +1,7 @@
-@Library('global-jenkins-library@2.4.0') _
+@Library('global-jenkins-library@2.7.3') _
 buildJavaProject(
         buildInfo: getBuildInfo(),
         integrationTestsEnvVars: [],
         shouldPublishJars: true,
         shouldPublishDockerImages: true,
-        dockerfileDir: '.',
-        preDevelopVisibility: 'iex.ec',
-        developVisibility: 'iex.ec',
-        preProductionVisibility: 'docker.io',
-        productionVisibility: 'docker.io')
+        dockerfileDir: '.')

README.md

@@ -15,6 +15,8 @@ To run properly, the iExec Result Proxy requires:
 
 You can configure the iExec Result Proxy with the following properties:
 
+### Main application properties
+
 | Environment variable | Description | Type | Default value |
 | --- | --- | --- | --- |
 | `IEXEC_RESULT_PROXY_PORT` | Server HTTP port of the result proxy. | Positive integer | `13200` |
@@ -30,6 +32,17 @@ You can configure the iExec Result Proxy with the following properties:
 | `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` |
 
+### Spring web application properties
+
+In addition to the aforementioned properties, it is possible to leverage [Spring Common Application Properties](https://docs.spring.io/spring-boot/docs/current/reference/html/application-properties.html).
+More specifically, you may want to configure limits of uploadable file sizes.
+In order to do so, you can override the default for the following [Web Properties](https://docs.spring.io/spring-boot/docs/current/reference/html/application-properties.html#appendix.application-properties.web).
+
+| Environment variable | Description | Type | Default value |
+| --- | --- | --- | --- |
+| `SPRING_SERVLET_MULTIPART_MAX_FILE_SIZE` | Max file size. | String | `1MB` |
+| `SPRING_SERVLET_MULTIPART_MAX_REQUEST_SIZE` | Max request size. | String | `10MB` |
+
 ## Health checks
 
 A health endpoint (`/actuator/health`) is enabled by default and can be accessed on the **IEXEC_RESULT_PROXY_PORT**.

build.gradle

@@ -1,15 +1,15 @@
 plugins {
     id 'java'
-    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 'io.freefair.lombok' version '8.2.2'
+    id 'org.springframework.boot' version '2.7.14'
+    id 'io.spring.dependency-management' version '1.1.3'
     id 'jacoco'
-    id 'org.sonarqube' version '3.3'
+    id 'org.sonarqube' version '4.2.1.3168'
     id 'maven-publish'
 }
 
 ext {
-    springCloudVersion = '2021.0.5'
+    springCloudVersion = '2021.0.8'
     jjwtVersion = '0.11.5'
 }
 
@@ -32,9 +32,6 @@ allprojects {
                 password nexusPassword
             }
         }
-        maven {
-            url 'https://nexus.intra.iex.ec/repository/maven-public/'
-        }
         maven {
             url 'https://jitpack.io'
         }
@@ -51,12 +48,6 @@ dependencies {
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
 
-    // Web3j issues, see core build.gradle
-    // 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'
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
@@ -67,13 +58,6 @@ dependencies {
     // observability
     runtimeOnly 'io.micrometer:micrometer-registry-prometheus'
 
-    // test
-    testImplementation('org.springframework.boot:spring-boot-starter-test') {
-        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
-    }
-    testImplementation 'org.springframework.security:spring-security-test'
-    testImplementation 'org.mockito:mockito-inline:2.13.0' // activates mocking final classes/methods
-
     // Spring Doc
     implementation 'org.springdoc:springdoc-openapi-ui:1.6.3'
 
@@ -87,6 +71,10 @@ dependencies {
 
     // expiring map
     implementation 'net.jodah:expiringmap:0.5.10'
+
+    // test
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 dependencyManagement {
@@ -110,16 +98,11 @@ test {
     useJUnitPlatform()
 }
 
-task itest {
+tasks.register('itest') {
     group 'Verification'
     description 'Runs the integration tests.'
 }
 
-// the test coverage report is
-// created just before the build
-jacoco {
-    toolVersion = "0.8.7"
-}
 // sonarqube code coverage requires jacoco XML report
 jacocoTestReport {
     reports {
@@ -151,7 +134,7 @@ ext.jarPathForOCI  = relativePath(tasks.bootJar.outputs.files.singleFile)
 ext.gitShortCommit = 'git rev-parse --short=8 HEAD'.execute().text.trim()
 ext.ociImageName   = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
 
-task buildImage(type: Exec) {
+tasks.register('buildImage', Exec) {
     group       'Build'
     description 'Builds an OCI image from a Dockerfile.'
     dependsOn   tasks.bootJar

gradle.properties

@@ -1,6 +1,6 @@
-version=8.1.1
-iexecCommonVersion=8.2.1
-iexecCommonsPocoVersion=3.0.4
+version=8.2.0
+iexecCommonVersion=8.3.0
+iexecCommonsPocoVersion=3.1.0
 
 nexusUser
 nexusPassword

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -9,6 +9,7 @@ dependencies {
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 java {
@@ -20,9 +21,6 @@ test {
     useJUnitPlatform()
 }
 
-jacoco {
-    toolVersion = "0.8.7"
-}
 // sonarqube code coverage requires jacoco XML report
 jacocoTestReport {
     reports {