Merge pull request #108 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-blockchain-adapter-api/releases/tag/v8.2.0) 2023-09-28
+
+### Bug Fixes
+- Fix and harmonize `Dockerfile entrypoint` in all Spring Boot applications. (#102)
+### Quality
+- Remove `nexus.intra.iex.ec` repository. (#96)
+- Upgrade to Gradle 8.2.1 with up-to-date plugins. (#100)
+- Clean TODOs. (#104)
+- `ChainConfig` instance is immutable and validated. Application will fail to start if chain config parameters violate constraints. (#105)
+- Remove `SignerService` class only used in integration tests. (#107)
+### Dependency Upgrades
+- Upgrade to `eclipse-temurin` 11.0.20. (#98)
+- Upgrade to Spring Boot 2.7.14. (#99)
+- Upgrade to Spring Dependency Management Plugin 1.1.3. (#99)
+- Upgrade to `testcontainers` 1.19.0. (#101)
+- Upgrade to `jenkins-library` 2.7.3. (#103)
+- Upgrade to `iexec-common` 8.3.0. (#106)
+- Upgrade to `iexec-common-poco` 3.1.0. (#106)
+
 ## [[8.1.1]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.1.1) 2023-06-23
 
 ### Dependency Upgrades
@@ -13,7 +32,7 @@ All notable changes to this project will be documented in this file.
 ### New Features
 - Enable Prometheus actuator. (#79)
 - Rework `QueueService` with a thread pool based on a `PriorityBlockingQueue`. (#84)
-- Do not use `broker` to match ordes on chain. (#87 #88)
+- Do not use `broker` to match orders on chain. (#87 #88)
 ### Bug Fixes
 - Fix security rule to access Swagger API. (#79)
 ### Quality

Jenkinsfile

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

README.md

@@ -13,7 +13,6 @@ The iExec Blockchain Adapter API is available as an OCI image on [Docker Hub](ht
 To run properly, the iExec Blockchain Adapter API requires:
 * A blockchain node. iExec smart contracts must be deployed on the blockchain network.
 * A MongoDB instance to persist its data.
-* A broker service to match iExec orders.
 * An Ethereum wallet to interact with smart contracts on the blockchain network.
 
 ## Configuration

build.gradle

@@ -1,15 +1,16 @@
 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 {
 	openFeignVersion = '11.10'
+	testContainersVersion = '1.19.0'
 }
 
 if (!project.hasProperty('gitBranch')) {
@@ -32,9 +33,6 @@ allprojects {
 				password nexusPassword
 			}
 		}
-		maven {
-			url "https://nexus.intra.iex.ec/repository/maven-public/"
-		}
 		maven {
 			url "https://jitpack.io"
 		}
@@ -46,31 +44,35 @@ allprojects {
 	}
 }
 
+sourceSets {
+	itest {
+		java {
+			compileClasspath += main.output + test.output
+			runtimeClasspath += main.output + test.output
+		}
+	}
+}
+
 configurations {
 	itestRuntime.extendsFrom testRuntime
 	itestImplementation.extendsFrom testImplementation
 }
 
 dependencies {
-	// Spring Doc
-	implementation 'org.springdoc:springdoc-openapi-ui:1.6.3'
-
+	// Spring framework
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 	implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 
+	// Spring Doc
+	implementation 'org.springdoc:springdoc-openapi-ui:1.6.3'
+
 	// iexec
 	implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
 	implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
 
-	// web3j bug required
-	// 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
-
 	// feign
 	implementation "io.github.openfeign:feign-jackson:$openFeignVersion"
 	implementation "io.github.openfeign:feign-slf4j:$openFeignVersion"
@@ -82,9 +84,10 @@ dependencies {
 	implementation project(':iexec-blockchain-adapter-api-library')
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testImplementation 'org.awaitility:awaitility'
 
-	itestImplementation 'org.testcontainers:junit-jupiter:1.18.1'
+	itestImplementation "org.testcontainers:junit-jupiter:$testContainersVersion"
 }
 
 springBoot {
@@ -98,15 +101,6 @@ tasks.named("bootJar") {
 	}
 }
 
-sourceSets {
-	itest {
-		java {
-			compileClasspath += main.output + test.output
-			runtimeClasspath += main.output + test.output
-		}
-	}
-}
-
 tasks.register("itest", Test) {
 	doFirst {
 		exec {
@@ -119,13 +113,6 @@ tasks.register("itest", Test) {
 	classpath = sourceSets.itest.runtimeClasspath
 }
 
-jar {
-	enabled = true
-	archiveClassifier.set('library')
-	from sourceSets.main.allSource
-	duplicatesStrategy = 'exclude'
-}
-
 publishing {
 	publications {
 		maven(MavenPublication) {
@@ -149,9 +136,6 @@ tasks.withType(Test).configureEach {
 	useJUnitPlatform()
 }
 
-jacoco {
-    toolVersion = "0.8.7"
-}
 // sonarqube code coverage requires jacoco XML report
 jacocoTestReport {
     reports {
@@ -164,7 +148,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 bootJar

docker/Dockerfile

@@ -1,5 +1,5 @@
 # Build app container
-FROM eclipse-temurin:11.0.18_10-jre
+FROM eclipse-temurin:11.0.20_8-jre-focal
 
 ARG jar
 
@@ -11,4 +11,4 @@ RUN apt-get update \
 
 COPY $jar app.jar
 
-ENTRYPOINT [ "/bin/sh", "-c", "exec java -Djava.security.egd=file:/dev/./urandom -jar app.jar" ]
+ENTRYPOINT [ "java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar" ]

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 {