FAB-5299 v1.0.1 release start

Change-Id: Iefb76c6de4fc816af7a8e42f23c4de20f212344c Signed-off-by: rickr <cr22rc@gmail.com>
hyperledger · Jul 13, 2017 · 0171c93 · 0171c93
1 parent e976abd
commit 0171c93
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -34,12 +34,10 @@ SDK's `Enrollment` interface.
 `*************************************************`
 ## *v1.0.0*
 
-This is git tagged v1.0.0 release of the SDK where there is no
+There is a git tagged v1.0.0 [e976abdc658f212d0c3a80ace4499a5cff4279c6] release of the SDK where there is no
 need to build the Hyperledger Fabric and Hyperledger Fabric CA described below.
 The provided docker-compose.yaml for the integration tests should pull v1.0.0  tagged images from Docker hub.
 
-Later versions of the SDK are NOT guaranteed to work with v1.0.0 tagged images of Hyperledger Fabric and Hyperledger Fabric CA.
-
 The v1.0.0 version of the Hyperledger Fabric Java SDK is published to Maven so you can directly use in your application's pom.xml.
 
 [Maven Repository Hyperledger Fabric Java SDK](https://mvnrepository.com/artifact/org.hyperledger.fabric-sdk-java/fabric-sdk-java)
@@ -54,7 +52,7 @@ _Make sure you're using docker images at the level of the Fabric that matches th
 
 ## Valid builds of Fabric and Fabric-ca
 
-Hyperledger Fabric v1.1 is currently under active development and the very latest Hyperledger Fabric builds may not work with this sdk.
+Hyperledger Fabric v1.0.1 is currently under active development and the very latest Hyperledger Fabric builds may not work with this sdk.
 You should use the following commit levels of the Hyperledger projects:
 
 <!--
@@ -64,8 +62,8 @@ You should use the following commit levels of the Hyperledger projects:
 
 | Project        | Commit level                               | Date                       |
 |:---------------|:------------------------------------------:|---------------------------:|
-| fabric         | 66655f733435685f47cb3f16674c79f00ee0b123   | Jun 14 04:26:47 2017 +0000 |
-| fabric-ca      | 7555a9b9bc1fded60b74ceee9bc64d3af2d080fb   | Jun  9 16:42:57 2017 +0000 |
+| fabric         | f56a82e36e040e1c1a986edfceac014ba1516571   | Jul 11 12:48:33 2017 -0700 |
+| fabric-ca      | 74f8f4d4c29e45a79a8849efb057dbd8de3ae8d0   | Jul 11 16:43:39 2017 +0200 |
 
  You can clone these projects by going to the [Hyperledger repository](https://gerrit.hyperledger.org/r/#/admin/projects/).
 
@@ -143,19 +141,6 @@ Add below code in your `pom.xml` to download fabric-sdk-java-1.0
 
 ```xml
 
-     <repositories>
-        <repository>
-            <id>nexus-snapshot</id>
-            <url>https://nexus.hyperledger.org/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-     </repositories>
-
      <dependencies>
      <dependency>
             <groupId>org.hyperledger.fabric-sdk-java</groupId>
@@ -328,7 +313,7 @@ JIRA Fields should be:
   <dt>Component</dt>
   <dd>fabric-sdk-java</dd>
   <dt>Fix Versions</dt>
-    <dd>v1.1</dd>
+    <dd>v1.0.1</dd>
 </dl>
 
 Pleases provide as much information that you can with the issue you're experiencing: stack traces logs.

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.hyperledger.fabric-sdk-java</groupId>
     <artifactId>fabric-sdk-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1-SNAPSHOT</version>
     <name>fabric-java-sdk</name>
     <description>Java SDK for Hyperledger fabric project</description>
     <url>https://www.hyperledger.org/community/projects</url>

diff --git a/src/main/proto/msp/msp_config.proto b/src/main/proto/msp/msp_config.proto
@@ -83,6 +83,14 @@ message FabricMSPConfig {
     // FabricCryptoConfig contains the configuration parameters
     // for the cryptographic algorithms used by this MSP
     FabricCryptoConfig crypto_config = 8;
+
+    // List of TLS root certificates trusted by this MSP.
+    // They are returned by GetTLSRootCerts.
+    repeated bytes tls_root_certs = 9;
+
+    // List of TLS intermediate certificates trusted by this MSP;
+    // They are returned by GetTLSIntermediateCerts.
+    repeated bytes tls_intermediate_certs = 10;
 }
 
 // FabricCryptoConfig contains configuration parameters

diff --git a/src/test/fixture/sdkintegration/.env b/src/test/fixture/sdkintegration/.env
@@ -11,7 +11,7 @@ ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_TLS=false
 ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS=
 #
 #Image tags:
-IMAGE_TAG_FABRIC=:x86_64-1.0.0
-IMAGE_TAG_FABRIC_CA=:x86_64-1.0.0
-#IMAGE_TAG_FABRIC=
-#IMAGE_TAG_FABRIC_CA=
+#IMAGE_TAG_FABRIC=:x86_64-1.0.0
+#IMAGE_TAG_FABRIC_CA=:x86_64-1.0.0
+IMAGE_TAG_FABRIC=
+IMAGE_TAG_FABRIC_CA=