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
Consensys · May 7, 2019 · 9cbcbe1 · 9cbcbe1
1 parent 7e39a03
commit 9cbcbe1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>