Merge pull request #87 from iExecBlockchainComputing/feature/[email protected]@8.1.0-NEXT-SNAPSHOT

Feature/iexec commons [email protected] iexec [email protected] next snapshot

Author: jbern0rd

CHANGELOG.md

@@ -11,8 +11,8 @@ All notable changes to this project will be documented in this file.
 ### Quality
 ### Dependency Upgrades
 - Upgrade to `expiringmap` 0.5.10. (#84)
-- Upgrade to `iexec-common` 8.0.0. (#85)
-- Upgrade to `iexec-commons-poco` 1.0.2. (#85)
+- Upgrade to `iexec-common` 8.1.0-NEXT-SNAPSHOT. (#85 #87)
+- Upgrade to `iexec-commons-poco` 2.0.0. (#85 #87)
 
 ## [[8.0.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.0.0) 2023-03-03
 

gradle.properties

@@ -1,6 +1,6 @@
 version=8.0.0
-iexecCommonVersion=8.0.0
-iexecCommonsPocoVersion=1.0.2
+iexecCommonVersion=8.1.0-NEXT-SNAPSHOT
+iexecCommonsPocoVersion=2.0.0
 
 nexusUser
 nexusPassword

iexec-result-proxy-library/build.gradle

@@ -6,6 +6,7 @@ plugins {
 }
 
 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'
 }

iexec-result-proxy-library/src/main/java/com/iexec/resultproxy/api/ResultProxyClient.java

@@ -16,8 +16,8 @@
 
 package com.iexec.resultproxy.api;
 
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
 import com.iexec.common.result.ResultModel;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import feign.Headers;
 import feign.Param;
 import feign.RequestLine;

src/main/java/com/iexec/resultproxy/challenge/ChallengeService.java

@@ -16,8 +16,8 @@
 
 package com.iexec.resultproxy.challenge;
 
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
 import com.iexec.common.security.SignedChallenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import com.iexec.commons.poco.utils.BytesUtils;
 import com.iexec.commons.poco.utils.SignatureUtils;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/iexec/resultproxy/challenge/EIP712ChallengeService.java

@@ -1,8 +1,8 @@
 package com.iexec.resultproxy.challenge;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.entity.Challenge;
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.entity.Challenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import lombok.extern.slf4j.Slf4j;
 import net.jodah.expiringmap.ExpirationPolicy;
 import net.jodah.expiringmap.ExpiringMap;

src/main/java/com/iexec/resultproxy/proxy/ProxyController.java

@@ -1,8 +1,8 @@
 package com.iexec.resultproxy.proxy;
 
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
 import com.iexec.common.result.ResultModel;
 import com.iexec.common.security.SignedChallenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import com.iexec.resultproxy.challenge.ChallengeService;
 import com.iexec.resultproxy.ipfs.IpfsService;
 import com.iexec.resultproxy.ipfs.task.IpfsNameService;