Merge pull request #534 from iExecBlockchainComputing/hotfix/7.2.2

Hotfix/7.2.2

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[7.2.2]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v7.2.2) 2022-12-20
+
+* Use `iexec-common` version [6.2.0](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/v6.2.0).
+* Use `okhttp` version 4.9.0 to keep it consistent with the one in the web3j dependency imported by `iexec-common`.
+
 ## [[7.2.1]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v7.2.1) 2022-12-13
 
 * Replace `sessionId` implementation with a hash of the public configuration. From a consumer point of view, a constant hash received from the `POST /ping` response indicates that the scheduler configuration has not changed. With such constant hash, either the scheduler has restarted or not, the consumer does not need to reboot.

build.gradle

@@ -70,9 +70,9 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-hateoas"
 
     // NoSuchMethodError: 'okhttp3.RequestBody okhttp3.RequestBody.create(java.lang.String, okhttp3.MediaType)'
-    implementation 'com.squareup.okhttp3:okhttp:4.3.1' // Web3j issue: https://github.com/web3j/web3j/issues/1180
-    // NoSuchMethodError: 'byte[] kotlin.collections.ArraysKt.copyInto(byte[], byte[], int, int, int)'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.50' // https://stackoverflow.com/a/57907899
+    // 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
 
     testImplementation "org.springframework.boot:spring-boot-starter-test"
 

gradle.properties

@@ -1,5 +1,5 @@
-version=7.2.1
-iexecCommonVersion=6.1.0
+version=7.2.2
+iexecCommonVersion=6.2.0
 iexecBlockchainAdapterVersion=7.1.1
 iexecResultVersion=7.1.0
 iexecSmsVersion=7.1.0