From 73be91be0f5d118863f07464bd45993925b1e273 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Thu, 10 Feb 2022 21:41:21 +0100
Subject: [PATCH 1/4] Hadoop-17563 bounycastle 1.70

---
 LICENSE-binary         | 4 ++--
 hadoop-project/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index f5e8c707e6e0f..555cb0d03415b 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -468,8 +468,8 @@ com.microsoft.azure:azure-cosmosdb-gateway:2.4.5
 com.microsoft.azure:azure-data-lake-store-sdk:2.3.3
 com.microsoft.azure:azure-keyvault-core:1.0.0
 com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
-org.bouncycastle:bcpkix-jdk15on:1.60
-org.bouncycastle:bcprov-jdk15on:1.60
+org.bouncycastle:bcpkix-jdk15on:1.70
+org.bouncycastle:bcprov-jdk15on:1.70
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.jruby.jcodings:jcodings:1.0.13
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index da9932be019b0..42ffbfa026821 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -109,7 +109,7 @@
     <guava.version>27.0-jre</guava.version>
     <guice.version>4.2.3</guice.version>
 
-    <bouncycastle.version>1.60</bouncycastle.version>
+    <bouncycastle.version>1.70</bouncycastle.version>
 
     <!-- Required for testing LDAP integration -->
     <apacheds.version>2.0.0-M21</apacheds.version>

From 5a8a18f5283e648c49461bf0fdc02ca635ac2c36 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sat, 26 Feb 2022 15:10:55 +0100
Subject: [PATCH 2/4] Update LICENSE-binary

---
 LICENSE-binary | 1 +
 1 file changed, 1 insertion(+)

diff --git a/LICENSE-binary b/LICENSE-binary
index 555cb0d03415b..87cfc961b8748 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -470,6 +470,7 @@ com.microsoft.azure:azure-keyvault-core:1.0.0
 com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
 org.bouncycastle:bcpkix-jdk15on:1.70
 org.bouncycastle:bcprov-jdk15on:1.70
+org.bouncycastle:bcutil-jdk15on:1.70
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.jruby.jcodings:jcodings:1.0.13

From 0f0fcc3197c6eb5757975aa13b79821a5fb0abac Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Mon, 28 Feb 2022 11:30:21 +0100
Subject: [PATCH 3/4] try bouncycastle 1.67

---
 LICENSE-binary         | 5 ++---
 hadoop-project/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 87cfc961b8748..71b33fb73bfd6 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -468,9 +468,8 @@ com.microsoft.azure:azure-cosmosdb-gateway:2.4.5
 com.microsoft.azure:azure-data-lake-store-sdk:2.3.3
 com.microsoft.azure:azure-keyvault-core:1.0.0
 com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
-org.bouncycastle:bcpkix-jdk15on:1.70
-org.bouncycastle:bcprov-jdk15on:1.70
-org.bouncycastle:bcutil-jdk15on:1.70
+org.bouncycastle:bcpkix-jdk15on:1.67
+org.bouncycastle:bcprov-jdk15on:1.67
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.jruby.jcodings:jcodings:1.0.13
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 42ffbfa026821..fde0d36100b66 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -109,7 +109,7 @@
     <guava.version>27.0-jre</guava.version>
     <guice.version>4.2.3</guice.version>
 
-    <bouncycastle.version>1.70</bouncycastle.version>
+    <bouncycastle.version>1.67</bouncycastle.version>
 
     <!-- Required for testing LDAP integration -->
     <apacheds.version>2.0.0-M21</apacheds.version>

From 06c26f332149e0ec71d1d0a3c16fa386a209c9ca Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Wed, 2 Mar 2022 20:41:55 +0100
Subject: [PATCH 4/4] try bouncycastle 1.68

---
 LICENSE-binary         | 4 ++--
 hadoop-project/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE-binary b/LICENSE-binary
index 71b33fb73bfd6..de4e1cb75b356 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -468,8 +468,8 @@ com.microsoft.azure:azure-cosmosdb-gateway:2.4.5
 com.microsoft.azure:azure-data-lake-store-sdk:2.3.3
 com.microsoft.azure:azure-keyvault-core:1.0.0
 com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre7
-org.bouncycastle:bcpkix-jdk15on:1.67
-org.bouncycastle:bcprov-jdk15on:1.67
+org.bouncycastle:bcpkix-jdk15on:1.68
+org.bouncycastle:bcprov-jdk15on:1.68
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.jruby.jcodings:jcodings:1.0.13
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index fde0d36100b66..82dc6810d7cc9 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -109,7 +109,7 @@
     <guava.version>27.0-jre</guava.version>
     <guice.version>4.2.3</guice.version>
 
-    <bouncycastle.version>1.67</bouncycastle.version>
+    <bouncycastle.version>1.68</bouncycastle.version>
 
     <!-- Required for testing LDAP integration -->
     <apacheds.version>2.0.0-M21</apacheds.version>