Merge remote-tracking branch 'upstream/1.2' into 1.2-bc-fips

opensearch-project · Jan 12, 2022 · 991f488 · 991f488
2 parents 4be4ee7 + 7d878a8
commit 991f488
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -25,7 +25,7 @@ joda              = 2.10.4
 # when updating this version, you need to ensure compatibility with:
 #  - plugins/ingest-attachment (transitive dependency, check the upstream POM)
 #  - distribution/tools/plugin-cli
-bouncycastle=1.64
+bouncycastle=1.70
 # test dependencies
 randomizedrunner  = 2.7.1
 junit             = 4.12

diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1 b/plugins/ingest-attachment/licenses/bcmail-jdk15on-1.64.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcmail-jdk15on-1.70.jar.sha1 b/plugins/ingest-attachment/licenses/bcmail-jdk15on-1.70.jar.sha1
@@ -0,0 +1 @@
+08f4aafad90f6cc7f16b9992279828ae848c9e0d
diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1 b/plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.64.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.70.jar.sha1 b/plugins/ingest-attachment/licenses/bcpkix-jdk15on-1.70.jar.sha1
@@ -0,0 +1 @@
+f81e5af49571a9d5a109a88f239a73ce87055417
diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk15on-1.64.jar.sha1 b/plugins/ingest-attachment/licenses/bcprov-jdk15on-1.64.jar.sha1
diff --git a/plugins/ingest-attachment/licenses/bcprov-jdk15on-1.70.jar.sha1 b/plugins/ingest-attachment/licenses/bcprov-jdk15on-1.70.jar.sha1
@@ -0,0 +1 @@
+4636a0d01f74acaf28082fb62b317f1080118371