v2.2.0 release (#57)

- Test against Fabric 2.2 - Use CouchDB 3.1 (to match Fabric 2.2 environment) Signed-off-by: Mark S. Lewis <[email protected]>
hyperledger · Jul 16, 2020 · e36621e · e36621e
1 parent 811dff6
commit e36621e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.hyperledger.fabric</groupId>
     <artifactId>fabric-gateway-java</artifactId>
-    <version>2.1.4</version>
+    <version>2.2.0</version>
     <packaging>jar</packaging>
 
     <name>fabric-gateway-java</name>
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.hyperledger.fabric-sdk-java</groupId>
             <artifactId>fabric-sdk-java</artifactId>
-            <version>[2.1.4,2.2.0)</version>
+            <version>[2.2.0,2.3.0)</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/src/test/fixtures/docker-compose/.env b/src/test/fixtures/docker-compose/.env
@@ -1,3 +1,3 @@
-DOCKER_IMG_TAG=:2.1
-FABRIC_CA_TAG=:latest
-THIRDPARTY_IMG_TAG=:0.4.16
+DOCKER_IMG_TAG=:2.2
+FABRIC_CA_TAG=:1.4
+COUCH_DB_TAG=:3.1
diff --git a/src/test/fixtures/docker-compose/docker-compose-base.yaml b/src/test/fixtures/docker-compose/docker-compose-base.yaml
@@ -92,6 +92,9 @@ services:
       # # bridge network as the peers
       # # https://docs.docker.com/compose/networking/
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default
+
+      - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin
+      - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric
     command: peer node start
     volumes:
@@ -124,4 +127,7 @@ services:
 
   couchdb:
     container_name: couchdb
-    image: hyperledger/fabric-couchdb${THIRDPARTY_IMG_TAG}
+    image: couchdb${COUCH_DB_TAG}
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=adminpw
diff --git a/src/test/java/scenario/ScenarioSteps.java b/src/test/java/scenario/ScenarioSteps.java
@@ -70,7 +70,7 @@ public class ScenarioSteps implements En {
     private static final long EVENT_TIMEOUT_SECONDS = 30;
     private static final Set<String> runningChaincodes = new HashSet<>();
     private static boolean channelsJoined = false;
-    private static final String COUCHDB_SERVER_URL = "http://localhost:5984";
+    private static final String COUCHDB_SERVER_URL = "http://admin:adminpw@localhost:5984";
     private static final String DOCKER_COMPOSE_TLS_FILE = "docker-compose-tls.yaml";
     private static final String DOCKER_COMPOSE_FILE = "docker-compose.yaml";
     private static final Path DOCKER_COMPOSE_DIR = Paths.get("src", "test", "fixtures", "docker-compose").toAbsolutePath();