From 9cbcbe14219f76031aacc00f0155abdbddebb15e Mon Sep 17 00:00:00 2001
From: Mark Lowe <melowe@users.noreply.github.com>
Date: Tue, 7 May 2019 20:42:31 +0100
Subject: [PATCH] Bugfix bouncycastle version conflict (#736)

* resolve bouncycastle dependency version conflict

* Increment snapshot version to 0.9.1-SNAPSHOT

* [maven-release-plugin] prepare release tessera-0.9.1

* [maven-release-plugin] prepare for next development iteration

* Increment snapshot version to 0.10-SNAPSHOT to match master
before creating PR
---
 enclave/enclave-jaxrs/pom.xml      | 1 -
 enclave/enclave-websockets/pom.xml | 2 +-
 pom.xml                            | 9 ++++++++-
 server/websockets-server/pom.xml   | 2 +-
 tessera-sync/pom.xml               | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/enclave/enclave-jaxrs/pom.xml b/enclave/enclave-jaxrs/pom.xml
index 83f61e5a28..59ee86466d 100644
--- a/enclave/enclave-jaxrs/pom.xml
+++ b/enclave/enclave-jaxrs/pom.xml
@@ -107,7 +107,6 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.59</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>
diff --git a/enclave/enclave-websockets/pom.xml b/enclave/enclave-websockets/pom.xml
index 35dcd483ca..d4233a2a42 100644
--- a/enclave/enclave-websockets/pom.xml
+++ b/enclave/enclave-websockets/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.jpmorgan.quorum</groupId>
         <artifactId>enclave</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>enclave-websockets</artifactId>
     <packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 30d4be2ad1..f779c71aa1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
         <grpc.version>1.14.0</grpc.version>
         <h2.version>1.4.199</h2.version>
         <owasp.plugin.version>5.0.0-M2</owasp.plugin.version>
+        <bouncycastle.version>1.61</bouncycastle.version>
         <logback.version>1.2.3</logback.version>
     </properties>
 
@@ -652,7 +653,13 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcpkix-jdk15on</artifactId>
-                <version>1.61</version>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bouncycastle.version}</version>
             </dependency>
 
             <dependency>
diff --git a/server/websockets-server/pom.xml b/server/websockets-server/pom.xml
index ad02ae5be2..cf6be7652d 100644
--- a/server/websockets-server/pom.xml
+++ b/server/websockets-server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.jpmorgan.quorum</groupId>
         <artifactId>server</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>websockets-server</artifactId>
     <packaging>jar</packaging>
diff --git a/tessera-sync/pom.xml b/tessera-sync/pom.xml
index 3ec6bbb569..7b4784f83b 100644
--- a/tessera-sync/pom.xml
+++ b/tessera-sync/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.jpmorgan.quorum</groupId>
         <artifactId>tessera</artifactId>
-        <version>0.9-SNAPSHOT</version>
+        <version>0.10-SNAPSHOT</version>
     </parent>
     <artifactId>tessera-sync</artifactId>
     <packaging>jar</packaging>