FAB-9986 JSDK v1.2 commencement

Change-Id: Ibc788a5655c6f4b2584728e906a69d417d8e5836 Signed-off-by: rickr <cr22rc@gmail.com>
hyperledger · May 15, 2018 · 2294b0a · 2294b0a
1 parent d186e02
commit 2294b0a
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Java SDK for Hyperledger Fabric 1.1
+# Java SDK for Hyperledger Fabric 1.2
 Welcome to Java SDK for Hyperledger project. The SDK helps facilitate Java applications to manage the lifecycle of
  Hyperledger channels  and user chaincode. The SDK also provides a means to execute
   user chaincode, query blocks
@@ -22,6 +22,27 @@ SDK's `Enrollment` interface.
   only help you familiarize to get started with the SDK if you are new in this domain.
 
 
+## IMPORTANT: Version 1.2 IS WORK IN PROGRESS!
+If you don't require features of Fabric or Fabric CA version 1.2 you probably should consider the v1.1.x version of the SDK.
+To get the actual v1.1.0 SDK:
+
+```
+git clone https://github.com/hyperledger/fabric-sdk-java.git
+cd fabric-sdk-java/
+git checkout -b release-1.1
+```
+
+For Java applications use the latest published v1.1.x releases:
+```
+     <!-- https://mvnrepository.com/artifact/org.hyperledger.fabric-sdk-java/fabric-sdk-java -->
+     <dependency>
+         <groupId>org.hyperledger.fabric-sdk-java</groupId>
+         <artifactId>fabric-sdk-java</artifactId>
+         <version>1.1.0</version>
+     </dependency>
+
+```
+
 ## Known limitations and restrictions
 
 * TCerts are not supported: JIRA FAB-1401
@@ -30,32 +51,55 @@ SDK's `Enrollment` interface.
 <p &nbsp; />
 <p &nbsp; />
 
-`*************************************************`
-## *v1.1.0*
-
-## v1.1 release notes
-Please review the [v1.1 release notes](./docs/release_v1.1.0_notes.md) to familiarize yourself with changes since v1.0 release
-
 
 `*************************************************`
 
+## 1.2.0-SNAPSHOT builds
+Work in progress 1.2.0 SNAPSHOT builds can be used by adding the following to your application's
+pom.xml
+```
+<repositories>
+        <repository>
+            <id>snapshots-repo</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+<dependencies>
+
+        <!-- https://mvnrepository.com/artifact/org.hyperledger.fabric-sdk-java/fabric-sdk-java -->
+        <dependency>
+            <groupId>org.hyperledger.fabric-sdk-java</groupId>
+            <artifactId>fabric-sdk-java</artifactId>
+            <version>1.2.0-SNAPSHOT</version>
+        </dependency>
+
+</dependencies>
 ```
 
-## Latest builds of Fabric and Fabric-ca v1.1.0
-
-To get a functioning Fabric v1.1.0 network needed by the SDK Integration tests.
-In the directory `src/test/fixture/sdkintegration` issue :
-
-`./fabric.sh restart`
 
-This command needs to be rerun each time the Integration tests are run.
 
 You can clone these projects by going to the [Hyperledger repository](https://gerrit.hyperledger.org/r/#/admin/projects/).
 
 ## Latest Fabric Builds.
 Latest Fabric builds are seldom needed except for those working on the very latest Fabric features.
 Some information to help with that can been found in [Developer Instructions](./docs/DeveloperInstructions.md)
 
+## Latest builds of Fabric and Fabric-ca v1.2.0
+
+To get a functioning Fabric v1.2.0 network needed by the SDK Integration tests once it's built.
+In the directory `src/test/fixture/sdkintegration` issue :
+
+`./fabric.sh restart`
+
+This command needs to be rerun each time the Integration tests are run.
+
 ### Setting Up Eclipse
 To get started using the Fabric Java SDK with Eclipse, refer to the instructions at: ./docs/EclipseSetup.md
 

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.1.0</version>
+    <version>1.2.0-SNAPSHOT</version>
     <name>fabric-java-sdk</name>
     <description>Java SDK for Hyperledger fabric project</description>
     <url>https://www.hyperledger.org/community/projects</url>
@@ -28,7 +28,7 @@
         <tag>fabric-sdk-java-1.0</tag>
     </scm>
     <properties>
-        <grpc.version>1.11.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
+        <grpc.version>1.12.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
         <bouncycastle.version>1.59</bouncycastle.version>
         <httpclient.version>4.5.5</httpclient.version>
         <skipITs>true</skipITs>
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-http2</artifactId>
-            <version>4.1.23.Final</version>
+            <version>4.1.25.Final</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
         <dependency>
@@ -189,7 +189,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.20</version>
+            <version>1.21</version>
         </dependency>
 
     </dependencies>

diff --git a/src/test/fixture/sdkintegration/.env b/src/test/fixture/sdkintegration/.env
@@ -12,10 +12,10 @@ ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CA_TLS=
 ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CLIENT_AUTH_REQUIRED=false
 #
 #Image tags:
-IMAGE_TAG_FABRIC=:x86_64-1.1.0
-IMAGE_TAG_FABRIC_CA=:x86_64-1.1.0
-#IMAGE_TAG_FABRIC=
-#IMAGE_TAG_FABRIC_CA=
+#IMAGE_TAG_FABRIC=:x86_64-1.1.0
+#IMAGE_TAG_FABRIC_CA=:x86_64-1.1.0
+IMAGE_TAG_FABRIC=
+IMAGE_TAG_FABRIC_CA=
 #FAB_CONFIG_GEN_VERS=v1.0
 FAB_CONFIG_GEN_VERS=v1.1
 V11_IDENTITIES_ALLOWREMOVE=--cfg.identities.allowremove