From 30ef2c9b41984e79a7684ceac0da2792b803d594 Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Thu, 31 Jan 2019 10:36:40 -0800
Subject: [PATCH] Upgrade BouncyCastle to 1.60

---
 distribution/server/src/assemble/LICENSE.bin.txt |  6 +++---
 pom.xml                                          | 12 +++++++++---
 pulsar-sql/presto-distribution/LICENSE           |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 59ee68370d425..0d0ab4863d52f 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -546,9 +546,9 @@ Public Domain (CC0) -- licenses/LICENSE-CC0.txt
 
 Bouncy Castle License
  * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
-    - org.bouncycastle-bcpkix-jdk15on-1.55.jar
-    - org.bouncycastle-bcprov-jdk15on-1.55.jar
-    - org.bouncycastle-bcprov-ext-jdk15on-1.59.jar
+    - org.bouncycastle-bcpkix-jdk15on-1.60.jar
+    - org.bouncycastle-bcprov-jdk15on-1.60.jar
+    - org.bouncycastle-bcprov-ext-jdk15on-1.60.jar
 
 ------------------------
 
diff --git a/pom.xml b/pom.xml
index f0faa12067f37..94dee51ab1ea0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@ flexible messaging model and an intuitive client API.</description>
     <slf4j.version>1.7.25</slf4j.version>
     <commons.collections.version>3.2.2</commons.collections.version>
     <log4j2.version>2.10.0</log4j2.version>
-    <bouncycastle.version>1.55</bouncycastle.version>
+    <bouncycastle.version>1.60</bouncycastle.version>
     <jackson.version>2.9.7</jackson.version>
     <reflections.version>0.9.11</reflections.version>
     <swagger.version>1.5.21</swagger.version>
@@ -542,7 +542,7 @@ flexible messaging model and an intuitive client API.</description>
         <artifactId>jersey-client</artifactId>
         <version>${jersey.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>org.glassfish.jersey.inject</groupId>
         <artifactId>jersey-hk2</artifactId>
@@ -762,7 +762,7 @@ flexible messaging model and an intuitive client API.</description>
           </exclusion>
         </exclusions>
       </dependency>
-      
+
       <dependency>
         <groupId>io.jsonwebtoken</groupId>
         <artifactId>jjwt-api</artifactId>
@@ -797,6 +797,12 @@ flexible messaging model and an intuitive client API.</description>
         <version>${bouncycastle.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-ext-jdk15on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>net.jodah</groupId>
         <artifactId>typetools</artifactId>
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 8cfd7ba850218..95a006f507cb0 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -487,5 +487,5 @@ Public Domain (CC0) -- licenses/LICENSE-CC0.txt
 
 Bouncy Castle License
  * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
-    - bcpkix-jdk15on-1.55.jar
-    - bcprov-jdk15on-1.55.jar
+    - bcpkix-jdk15on-1.60.jar
+    - bcprov-jdk15on-1.60.jar