Merge pull request #66 from iExecBlockchainComputing/release/3.2.0

Release/3.2.0

CHANGELOG.md

@@ -2,89 +2,130 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[3.2.0]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v3.2.0) 2023-12-19
+
+### New Features
+
+- Add `contributionDeadline` and `finalDeadline` fields to `TaskDescription`. (#65)
+
+### Bug Fixes
+
+- Remove unsupported `post-compute` related fields from `DealParams` and `TaskDescription`. (#58)
+- Dataset names can be empty in Poco deals. (#59)
+- Catch all exceptions when reading the latest block number on the blockchain network. (#60)
+- Remove methods from `IexecHubAbstractService`, they were unused or moved to `iexec-core`. (#63)
+- Write PoCo orders classes `toString` implementations with compliant fields ordering. (#64)
+
+### Dependency Upgrades
+
+- Upgrade to Spring Boot 2.7.17. (#62)
+- Upgrade to `jenkins-library` 2.7.4. (#61)
+- Upgrade to `testcontainers` 1.19.3. (#62)
+
 ## [[3.1.0]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v3.1.0) 2023-09-25
 
 ### New Features
+
 - Add `isEligibleToContributeAndFinalize` method to `TaskDescription`. (#53)
 - Use `RawTransactionManager` instance to create App, Dataset and Workerpool on-chain in one block. (#54)
+
 ### Quality
+
 - Do not run tests in `itest` task to avoid executing them twice. (#47)
 - Upgrade to Gradle 8.2.1 with up-to-date plugins. (#49)
 - Fetch contribution deadline ratio during `@PostConstruct` execution in `IexecHubAbstractService`. (#51)
 - Remove dead code in `IexecHubAbstractService` and `Web3jAbstractService`. (#54 #55)
+
 ### Dependency Upgrades
+
 - Upgrade to Spring Boot 2.7.14. (#48)
 - Upgrade to `testcontainers` 1.19.0. (#50)
 - Upgrade to `jenkins-library` 2.7.3. (#52)
 
 ## [[3.0.5]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v3.0.5) 2023-06-26
 
 ### Bug Fixes
+
 - Fix regression on dataset URI decryption in `TaskDescription`. The regression concerned bad interpretation of IPFS MultiAddress URIs. (#45)
 
 ## [[3.0.4]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v3.0.4) 2023-06-23
 
 ### Bug Fixes
+
 - Fix regression on `DealParams` deserialization. (#43)
 
 ## [[3.0.3]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v3.0.3) 2023-06-22
 
 ### New Features
+
 - Add IPFS gateways list and replace `convertToURI` with `isMultiAddress` in `MultiAddressHelper`. (#40)
+
 ### Quality
+
 - Improve `Web3jAbstractService` as well as its coverage. (#41)
 
 ## [[3.0.2]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v3.0.2) 2023-06-07
 
 ### Bug Fixes
+
 - Do not check connection on blockchain node in `Web3jAbstractService` constructor. (#37)
 - Properly handle `InterruptedException` instances caught in `WaitUtils`. (#37)
 
 ## [[3.0.0]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v3.0.0) 2023-06-05
 
 ### New Features
+
 - Call `IexecHubContract#viewDeal` instead of legacy ABI in `IexecHubAbstractService#getChainDeal`. (#24)
 - Representations of on-chain and off-chain objects are now immutable. (#24 #25 #26 #30 #34)
+
 ### Bug Fixes
+
 - Do not cast `retryDelay` to `int` in `IexecHubAbstractService` and `Retryer`. (#32)
 - Move `blockTime` from `IexecHubAbstractService` to `Web3jAbstractService`. (#33)
 - Set some logs to `debug` level in `EIP712Entity`. (#33)
+
 ### Quality
+
 - Move methods to get event blocks to `iexec-core`. (#28)
 - Add `IexecHubTestService` and `Web3jTestService` classes for tests. (#29)
 - Load `IexecHubContract` instance only once in `IexecHubAbstractService`. (#31)
 
 ## [[2.0.1]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v2.0.1) 2023-05-22
 
 ### New Features
+
 - Add purge cached task descriptions ability. (#20)
+
 ### Bug Fixes
+
 - Pull `poco-chain` image before tests. (#18)
 - Keep a security factor of 10 for callback gas consumption during `finalize` and `contributeAndFinalize`. (#22)
 
 ## [[2.0.0]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v2.0.0) 2023-05-11
 
 ### New Features
+
 - Upgrade `web3j` dependency from 4.8.9 to 4.9.7. (#8)
 - Regenerate all wrappers with new web3j cli version. (#8)
 - Update the readme file with the generation instructions. (#8)
 - Add `PLEASE_CONTRIBUTE_AND_FINALIZE` to `TaskNotificationType`. (#9)
 - Add `com.iexec.commmons.poco.order` package. (#10)
 - Add `com.iexec.commons.poco.eip712` package. (#11)
 - Add `MatchOrdersTests` on nethermind `poco-chain`. (#12)
+
 ### Bug Fixes
+
 - Set `protected` visibility on abstract classes constructors. (#13)
 
 ## [[1.0.2]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v1.0.2) 2023-04-11
 
 ### Bug Fixes
+
 - Remove unused `guava` dependency. (#5)
 
 ## [[1.0.0]](https://github.com/iExecBlockchainComputing/iexec-commons-poco/releases/tag/v1.0.0) 2023-04-06
 
 ### New Features
+
 - Init Gradle project. (#1 #2)
-- Migrate from `iexec-common` library to this `iexec-commons-poco` library packages related to blockchain and iExec PoCo protocol. (#3)  
-### Bug Fixes
-### Quality
-### Dependency Upgrades
+- Migrate from `iexec-common` library to this `iexec-commons-poco` library packages related to blockchain and iExec PoCo protocol. (#3)

Jenkinsfile

@@ -1,7 +1,5 @@
-@Library('[email protected].3') _
+@Library('[email protected].4') _
 buildJavaProject(
-    buildInfo: getBuildInfo(),
-    integrationTestsEnvVars: [],
     shouldPublishJars: true,
     shouldPublishDockerImages: false
 )

build.gradle

@@ -9,14 +9,14 @@ plugins {
 group = 'com.iexec.commons'
 
 ext {
-    testContainersVersion = '1.19.0'
+    testContainersVersion = '1.19.3'
 }
 
 if (!project.hasProperty('gitBranch')) {
     ext.gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
 }
 
-if (gitBranch != 'main' && gitBranch != 'master' && ! (gitBranch ==~ '(release|hotfix|support)/.*')) {
+if (gitBranch != 'main' && gitBranch != 'master' && !(gitBranch ==~ '(release|hotfix|support)/.*')) {
     version += '-NEXT-SNAPSHOT'
 }
 
@@ -34,7 +34,7 @@ repositories {
 }
 
 dependencies {
-    implementation platform('org.springframework.boot:spring-boot-dependencies:2.7.14')
+    implementation platform('org.springframework.boot:spring-boot-dependencies:2.7.17')
 
     // web3j
     api 'org.web3j:core:4.9.7'
@@ -44,15 +44,15 @@ dependencies {
 
     // multiaddresses (IPFS)
     implementation 'com.github.multiformats:java-multiaddr:v1.4.6'
-    
+
     // jaxb required with Java 11 DataTypeConverter in BytesUtils
     implementation 'javax.xml.bind:jaxb-api'
-    
+
     // failsafe
     implementation 'net.jodah:failsafe:2.4.4'
     //TODO Migrate from Awaitility to Failsafe everywhere
     implementation 'org.awaitility:awaitility'
-    
+
     // javax annotations like PostConstruct
     implementation 'javax.annotation:javax.annotation-api'
 
@@ -72,8 +72,10 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
+    sourceCompatibility = "11"
+    targetCompatibility = "11"
     withJavadocJar()
     withSourcesJar()
 }
@@ -84,11 +86,6 @@ tasks.withType(Test).configureEach {
 }
 
 test {
-    doFirst {
-        exec {
-            commandLine 'docker', 'compose', 'pull', '-q'
-        }
-    }
     reports {
         junitXml.required = true
         html.required = true

gradle.properties

@@ -1,4 +1,3 @@
-version=3.1.0
-
+version=3.2.0
 nexusUser
 nexusPassword

src/main/java/com/iexec/commons/poco/chain/DealParams.java

@@ -100,6 +100,10 @@ public class DealParams {
     @JsonProperty("iexec_input_files")
     List<String> iexecInputFiles = Collections.emptyList();
 
+    /**
+     * @deprecated will be removed in next major version
+     */
+    @Deprecated(forRemoval = true)
     @JsonProperty("iexec_developer_logger")
     boolean iexecDeveloperLoggerEnabled;
 
@@ -117,19 +121,27 @@ public class DealParams {
     @JsonProperty("iexec_secrets")
     Map<String, String> iexecSecrets = Collections.emptyMap();
 
-    //Should be set by SDK
+    /**
+     * @deprecated will be removed in next major version
+     */
+    @Deprecated(forRemoval = true)
     @JsonProperty("iexec_tee_post_compute_image")
     String iexecTeePostComputeImage;
 
-    //Should be set by SDK
+    /**
+     * @deprecated will be removed in next major version
+     */
+    @Deprecated(forRemoval = true)
     @JsonProperty("iexec_tee_post_compute_fingerprint")
     String iexecTeePostComputeFingerprint;
 
     @JsonPOJOBuilder(withPrefix = "")
-    public static class DealParamsBuilder{}
+    public static class DealParamsBuilder {
+    }
 
     /**
      * Creates an instance from a JSON string representation.
+     *
      * @param paramString data to create a DealParams instance.
      *                    The value will be parsed if it is a valid JSON string,
      *                    it will be used as <b>iexecArgs</b> value otherwise.
@@ -151,6 +163,7 @@ public static DealParams createFromString(String paramString) {
 
     /**
      * Represents the instance as a JSON string that will be written on chain.
+     *
      * @return the JSON string representing the instance
      */
     public String toJsonString() {