From 7c768d6403a95b28d40ffe8f01bfb5be24a3a442 Mon Sep 17 00:00:00 2001
From: rickr <cr22rc@gmail.com>
Date: Mon, 12 Feb 2018 09:13:38 -0500
Subject: [PATCH] FAB-8218 Update dependencies.

Change-Id: I39625dbddbdb749145fd9f6090bc0e596a6ccf0d
Signed-off-by: rickr <cr22rc@gmail.com>
---
 pom.xml                                                     | 6 +++---
 .../hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java  | 3 ---
 src/main/proto/msp/msp_config.proto                         | 2 --
 src/main/proto/msp/msp_principal.proto                      | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 65f18286..9569ead7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <tag>fabric-sdk-java-1.0</tag>
     </scm>
     <properties>
-        <grpc.version>1.9.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
+        <grpc.version>1.10.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.20.Final</version>
+            <version>4.1.21.Final</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
         <dependency>
@@ -124,7 +124,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.15</version>
+            <version>1.16.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/src/main/java/org/hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java b/src/main/java/org/hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java
index 386f1339..2cd946dd 100644
--- a/src/main/java/org/hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java
+++ b/src/main/java/org/hyperledger/fabric/sdk/ChaincodeEndorsementPolicy.java
@@ -189,9 +189,6 @@ private static IndexedHashMap<String, MSPPrincipal> parseIdentities(Map<?, ?> id
                 case "peer":
                     mspRoleType = MSPRole.MSPRoleType.PEER;
                     break;
-                case "orderer":
-                    mspRoleType = MSPRole.MSPRoleType.ORDERER;
-                    break;
                 default:
                     throw new ChaincodeEndorsementPolicyParseException(format("In identities with key %s name expected member, admin, client, peer or orderer  in role got %s ", key, name));
             }
diff --git a/src/main/proto/msp/msp_config.proto b/src/main/proto/msp/msp_config.proto
index ecdf03f1..14767a0d 100644
--- a/src/main/proto/msp/msp_config.proto
+++ b/src/main/proto/msp/msp_config.proto
@@ -192,6 +192,4 @@ message FabricNodeOUs {
     // OU Identifier of the peers
     FabricOUIdentifier peerOUIdentifier = 3;
 
-    // OU Identifier of the orderers
-    FabricOUIdentifier ordererOUIdentifier = 4;
 }
\ No newline at end of file
diff --git a/src/main/proto/msp/msp_principal.proto b/src/main/proto/msp/msp_principal.proto
index e7d13436..5fd8cddf 100644
--- a/src/main/proto/msp/msp_principal.proto
+++ b/src/main/proto/msp/msp_principal.proto
@@ -111,7 +111,6 @@ message MSPRole {
         ADMIN  = 1; // Represents an MSP Admin
         CLIENT = 2; // Represents an MSP Client
         PEER = 3; // Represents an MSP Peer
-        ORDERER = 4; // Represents an MSP Orderer
     }
 
     // MSPRoleType defines which of the available, pre-defined MSP-roles