Merge pull request Consensys#46 from ConsenSys/fix/upgrade-dependencies

Upgrade dependencies

application/atomic-appcontracts/erc20/build.gradle

@@ -6,12 +6,12 @@ dependencies {
     implementation files('../../../../web3j-abi/rlp/build/libs/rlp-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/utils/build/libs/utils-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/tuples/build/libs/tuples-4.8.7-SNAPSHOT.jar')
-    implementation "io.reactivex.rxjava2:rxjava:2.2.2"
+    implementation "io.reactivex.rxjava2:rxjava:${rxJavaVersion}"
 
     testImplementation project (path: ':common')
     testImplementation project (path: ':commontest')
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testImplementation "com.fasterxml.jackson.core:jackson-databind:2.8.11.6"
+
+    testImplementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
 }
 
 task generateSources {

application/atomic-appcontracts/erc20/src/test/java/net/consensys/gpact/appcontracts/atomic/erc20/LockableERC20Test.java

@@ -16,7 +16,7 @@
 
 import java.math.BigInteger;
 import net.consensys.gpact.common.RevertReason;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.web3j.protocol.exceptions.TransactionException;
 

application/atomic-appcontracts/lockablestorage/build.gradle

@@ -1,35 +1,25 @@
-
 dependencies {
-    implementation project (':common')
-    implementation project (':mes-txroot-transfer')
-    implementation project (':mes-attestor-sign')
-
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.12.0'
+    implementation project(':common')
+    implementation project(':mes-txroot-transfer')
+    implementation project(':mes-attestor-sign')
 
     implementation files('../../../../web3j-abi/abi/build/libs/abi-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/core/build/libs/core-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/crypto/build/libs/crypto-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/rlp/build/libs/rlp-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/utils/build/libs/utils-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/tuples/build/libs/tuples-4.8.7-SNAPSHOT.jar')
-    implementation "io.reactivex.rxjava2:rxjava:2.2.2"
+    implementation "io.reactivex.rxjava2:rxjava:${rxJavaVersion}"
     //    compile ('org.web3j:core:4.6.3')
 
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
-
     // https://mvnrepository.com/artifact/org.apache.tuweni/tuweni-bytes
     implementation group: 'org.apache.tuweni', name: 'tuweni-bytes', version: '1.0.0'
     // https://mvnrepository.com/artifact/org.apache.tuweni/tuweni-units
     implementation group: 'org.apache.tuweni', name: 'tuweni-units', version: '1.0.0'
 
     testImplementation project(':commontest')
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
-
 // Generate Solidity wrapper code before build.
 task generateSources {
     def script = "application/atomic-appcontracts/lockablestorage/gen.sh".execute()

application/atomic-appcontracts/lockablestorage/src/test/java/net/consensys/gpact/lockablestorage/test/LockableStorageAllValuesTypesTest.java

@@ -15,7 +15,7 @@
 package net.consensys.gpact.lockablestorage.test;
 
 import java.math.BigInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.web3j.protocol.exceptions.TransactionException;
 import org.web3j.tx.exceptions.ContractCallException;

application/atomic-appcontracts/lockablestorage/src/test/java/net/consensys/gpact/lockablestorage/test/LockableStorageInitTest.java

@@ -15,7 +15,7 @@
 package net.consensys.gpact.lockablestorage.test;
 
 import java.math.BigInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Check operation of the contract prior to any data being added to the contract. That is, check the

application/atomic-appcontracts/lockablestorage/src/test/java/net/consensys/gpact/lockablestorage/test/LockableStorageLockingUint256AllValuesTest.java

@@ -1,7 +1,7 @@
 package net.consensys.gpact.lockablestorage.test;
 
 import java.math.BigInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.exceptions.TransactionException;
 import org.web3j.tx.exceptions.ContractCallException;
 

application/atomic-appcontracts/lockablestorage/src/test/java/net/consensys/gpact/lockablestorage/test/LockableStorageLockingUint256Test.java

@@ -1,7 +1,7 @@
 package net.consensys.gpact.lockablestorage.test;
 
 import java.math.BigInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.exceptions.TransactionException;
 import org.web3j.tx.exceptions.ContractCallException;
 

application/atomic-appcontracts/lockablestorage/src/test/java/net/consensys/gpact/lockablestorage/test/LockableStorageTypesTest.java

@@ -15,7 +15,7 @@
 package net.consensys.gpact.lockablestorage.test;
 
 import java.math.BigInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.web3j.protocol.exceptions.TransactionException;
 import org.web3j.tx.exceptions.ContractCallException;

application/gpact-examples/conditional/build.gradle

@@ -4,26 +4,19 @@ dependencies {
     implementation project (':gpact')
     implementation project (':examplehelpers')
 
-    implementation group: 'com.google.guava', name: 'guava', version: '14.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.12.0'
-
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
 
     implementation files('../../../../web3j-abi/abi/build/libs/abi-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/core/build/libs/core-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/crypto/build/libs/crypto-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/rlp/build/libs/rlp-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/utils/build/libs/utils-4.8.7-SNAPSHOT.jar')
 
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
-
     // https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.2'
+    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: rxJavaVersion
 
     testImplementation project (':commontest')
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
+
 }
 
 task generateSources {

application/gpact-examples/conditional/src/test/java/net/consensys/gpact/exampletest/CrosschainConditional.java

@@ -1,19 +1,19 @@
 package net.consensys.gpact.exampletest;
 
 import net.consensys.gpact.examples.conditional.Main;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class CrosschainConditional extends AbstractExampleTest {
 
-  @Ignore
+  @Disabled
   @Test
   public void directSignSerialSingleBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(true, true, true);
     Main.main(new String[] {tempPropsFile});
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void transferSerialSingleBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(false, true, true);
@@ -26,7 +26,7 @@ public void directSignSerialMultiBlockchain() throws Exception {
     Main.main(new String[] {tempPropsFile});
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void transferSerialMultiBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(false, true, false);

application/gpact-examples/erc20tokenbridge/build.gradle

@@ -5,22 +5,16 @@ dependencies {
     implementation project(':mes-interface')
     implementation project(':examplehelpers')
 
-    implementation group: 'com.google.guava', name: 'guava', version: '14.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.12.0'
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
 
     implementation files('../../../../web3j-abi/abi/build/libs/abi-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/core/build/libs/core-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/crypto/build/libs/crypto-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/rlp/build/libs/rlp-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/utils/build/libs/utils-4.8.7-SNAPSHOT.jar')
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
 
     // https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.2'
+    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: rxJavaVersion
 
     testImplementation project(':commontest')
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }

application/gpact-examples/erc20tokenbridge/src/test/java/net/consensys/gpact/exampletest/CrosschainTokenBridge.java

@@ -15,7 +15,7 @@
 package net.consensys.gpact.exampletest;
 
 import net.consensys.gpact.examples.erc20tokenbridge.TokenBridge;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CrosschainTokenBridge extends AbstractExampleTest {
 

application/gpact-examples/hotel-train/build.gradle

@@ -5,11 +5,7 @@ dependencies {
     implementation project (':gpact')
     implementation project (':examplehelpers')
 
-    implementation group: 'com.google.guava', name: 'guava', version: '14.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.12.0'
-
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
 
     implementation files('../../../../web3j-abi/abi/build/libs/abi-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/core/build/libs/core-4.8.7-SNAPSHOT.jar')
@@ -18,15 +14,10 @@ dependencies {
     implementation files('../../../../web3j-abi/utils/build/libs/utils-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/tuples/build/libs/tuples-4.8.7-SNAPSHOT.jar')
 
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
-
     // https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.2'
+    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: rxJavaVersion
 
-    // compile ('org.web3j:core:4.6.3')
     testImplementation project (':commontest')
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 task generateSources {

application/gpact-examples/hotel-train/src/test/java/net/consensys/gpact/exampletest/CrosschainHotelTrain.java

@@ -1,7 +1,7 @@
 package net.consensys.gpact.exampletest;
 
 import net.consensys.gpact.examples.hoteltrain.HotelTrain;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CrosschainHotelTrain extends AbstractExampleTest {
 

application/gpact-examples/read/build.gradle

@@ -3,26 +3,18 @@ dependencies {
     implementation project (':gpact')
     implementation project (':examplehelpers')
 
-    implementation group: 'com.google.guava', name: 'guava', version: '14.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.12.0'
-
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
 
     implementation files('../../../../web3j-abi/abi/build/libs/abi-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/core/build/libs/core-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/crypto/build/libs/crypto-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/rlp/build/libs/rlp-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/utils/build/libs/utils-4.8.7-SNAPSHOT.jar')
 
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
-
     // https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.2'
+    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: rxJavaVersion
 
     testImplementation project (':commontest')
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 task generateSources {

application/gpact-examples/read/src/test/java/net/consensys/gpact/exampletest/CrosschainRead.java

@@ -1,32 +1,32 @@
 package net.consensys.gpact.exampletest;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class CrosschainRead extends AbstractExampleTest {
 
-  @Ignore
+  @Disabled
   @Test
   public void directSignSerialSingleBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(true, true, true);
     net.consensys.gpact.examples.read.Main.main(new String[] {tempPropsFile});
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void directSignParallelSingleBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(true, false, true);
     net.consensys.gpact.examples.read.Main.main(new String[] {tempPropsFile});
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void transferSerialSingleBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(false, true, true);
     net.consensys.gpact.examples.read.Main.main(new String[] {tempPropsFile});
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void transferParallelSingleBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(false, false, true);
@@ -39,7 +39,7 @@ public void directSignSerialMultiBlockchain() throws Exception {
     net.consensys.gpact.examples.read.Main.main(new String[] {tempPropsFile});
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void directSignParallelMultiBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(true, false, false);
@@ -52,7 +52,7 @@ public void transferSerialMultiBlockchain() throws Exception {
     net.consensys.gpact.examples.read.Main.main(new String[] {tempPropsFile});
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void transferParallelMultiBlockchain() throws Exception {
     String tempPropsFile = createPropertiesFile(false, false, false);

application/gpact-examples/trade/build.gradle

@@ -4,25 +4,18 @@ dependencies {
     implementation project (':gpact')
     implementation project (':examplehelpers')
 
-    implementation group: 'com.google.guava', name: 'guava', version: '14.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.12.0'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.12.0'
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
 
     implementation files('../../../../web3j-abi/abi/build/libs/abi-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/core/build/libs/core-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/crypto/build/libs/crypto-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/rlp/build/libs/rlp-4.8.7-SNAPSHOT.jar')
     implementation files('../../../../web3j-abi/utils/build/libs/utils-4.8.7-SNAPSHOT.jar')
 
-    implementation "com.squareup.okhttp3:okhttp:4.9.0"
-    implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
-
     // https://mvnrepository.com/artifact/io.reactivex.rxjava2/rxjava
-    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: '2.2.2'
+    implementation group: 'io.reactivex.rxjava2', name: 'rxjava', version: rxJavaVersion
 
     testImplementation project (':commontest')
-    testImplementation group: 'junit', name: 'junit', version: '4.12'
 }
 
 task generateSources {