From 79c849b7833fe90b670d3e55e79eea85c062568a Mon Sep 17 00:00:00 2001
From: "Mark S. Lewis" <Mark.S.Lewis@outlook.com>
Date: Tue, 9 May 2023 09:28:50 +0100
Subject: [PATCH] Remove netty-tcnative-boringssl-static dependency (#280)

Not required since tcnative with BoringSSL is already included in grpc-netty-shaded dependency.

Also update Bouncy Castle dependency to implementations for Java 1.8 and later only.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
---
 pom.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index b141ebc5..f9535697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,9 +28,9 @@
         <url>http://github.com/hyperledger/fabric-sdk-java</url>
     </scm>
     <properties>
-        <grpc.version>1.53.0</grpc.version>
-        <protobuf.version>3.21.7</protobuf.version> <!-- Must match version used by grpc-protobuf -->
-        <bouncycastle.version>1.70</bouncycastle.version>
+        <grpc.version>1.54.1</grpc.version>
+        <protobuf.version>3.21.12</protobuf.version> <!-- Must match version used by grpc-protobuf -->
+        <bouncycastle.version>1.73</bouncycastle.version>
         <httpclient.version>4.5.14</httpclient.version>
         <javadoc.version>3.2.0</javadoc.version>
         <skipITs>true</skipITs>
@@ -108,11 +108,6 @@
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative-boringssl-static</artifactId>
-            <version>2.0.58.Final</version>
-        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
@@ -138,10 +133,14 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <version>${bouncycastle.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
-
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>