remove org.ethereum.solcJ-all-0.4.25.jar (#323)

WeBankBlockchain · Nov 8, 2019 · 3079eaa · 3079eaa
1 parent dfb2dd0
commit 3079eaa
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,8 @@ allprojects {
 
     repositories {
         maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
-        maven { url "https://dl.bintray.com/ethereum/maven/" }
+        // "org.ethereum.solcJ-all-0.4.25"
+        // maven { url "https://dl.bintray.com/ethereum/maven/" }
         // maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         mavenLocal()
         mavenCentral()

diff --git a/weevent-broker/build.gradle b/weevent-broker/build.gradle
@@ -41,16 +41,18 @@ dependencies {
         // conflict with io.netty:netty-all:4.1.15.Final in web3sdk 1.3
         // io.netty:netty-tcnative-boringssl-static:2.0.20.Final crash
         exclude group: "io.netty"
+        // compile solidity
+        exclude group: "org.ethereum", module: "solcJ-all"
     }
     // web3sdk for FISCO-BCOS 1.3
     implementation("org.fisco-bcos:web3sdk-weevent:1.2.5") {
         exclude group: "org.slf4j", module: "slf4j-log4j12"
         exclude group: "org.springframework"
     }
-    
+
     // fabric 1.4.4
     implementation("org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.4")
-    
+
     // depend project
     implementation project(path: ":weevent-client")
 

diff --git a/weevent-broker/src/test/java/com/webank/weevent/broker/fabric/FabricBroker4ConsumerTest.java b/weevent-broker/src/test/java/com/webank/weevent/broker/fabric/FabricBroker4ConsumerTest.java
@@ -19,6 +19,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -29,6 +30,7 @@
  * @since 10/15/2019
  */
 @Slf4j
+@Ignore("Fabric is not default setting")
 public class FabricBroker4ConsumerTest extends JUnitTestBase {
     private final String topic2 = topicName + "1";
     private final String topic3 = topicName + "2";
@@ -75,7 +77,7 @@ public void before() throws Exception {
         if (StringUtils.isBlank(this.lastEventId)) {
             String data = String.format("hello world! %s", System.currentTimeMillis());
             WeEvent weEvent = new WeEvent(this.topicName, data.getBytes());
-            SendResult sendResultDto = this.iProducer. publish(weEvent, this.channelName);
+            SendResult sendResultDto = this.iProducer.publish(weEvent, this.channelName);
             Assert.assertEquals(SendResult.SendResultStatus.SUCCESS, sendResultDto.getStatus());
             this.lastEventId = sendResultDto.getEventId();
             log.info("publish lastEventId: {}", this.lastEventId);

diff --git a/weevent-broker/src/test/java/com/webank/weevent/broker/fabric/FabricBroker4ProducerTest.java b/weevent-broker/src/test/java/com/webank/weevent/broker/fabric/FabricBroker4ProducerTest.java
@@ -13,6 +13,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -23,6 +24,7 @@
  * @since 10/15/2019
  */
 @Slf4j
+@Ignore("Fabric is not default setting")
 public class FabricBroker4ProducerTest extends JUnitTestBase {
     private IProducer iProducer;
 

diff --git a/weevent-broker/src/test/java/com/webank/weevent/broker/fabric/FabricTopicAdminTest.java b/weevent-broker/src/test/java/com/webank/weevent/broker/fabric/FabricTopicAdminTest.java
@@ -21,6 +21,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -31,6 +32,7 @@
  * @since 10/15/2019
  */
 @Slf4j
+@Ignore("Fabric is not default setting")
 public class FabricTopicAdminTest extends JUnitTestBase {
     private IProducer iProducer;
     private String eventId = "";