You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2024/07/18 19:00:56 UTC
(solr) branch branch_9x updated: Update dependency org.bouncycastle:bcpkix-jdk18on to v1.78.1 (#2434)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 704b0b35da7 Update dependency org.bouncycastle:bcpkix-jdk18on to v1.78.1 (#2434)
704b0b35da7 is described below
commit 704b0b35da7a8f8a689bf9941a6f31c99b307cfb
Author: Solr Bot <12...@users.noreply.github.com>
AuthorDate: Thu Jul 18 20:37:36 2024 +0200
Update dependency org.bouncycastle:bcpkix-jdk18on to v1.78.1 (#2434)
* Update security policies for bouncyCastle
Co-authored-by: Jan Høydahl <ja...@apache.org>
(cherry picked from commit fcf84ee36896627ebbf5b5b4e565408fcce89b96)
---
gradle/testing/randomization/policies/solr-tests.policy | 1 +
solr/licenses/bcpkix-jdk18on-1.77.jar.sha1 | 1 -
solr/licenses/bcpkix-jdk18on-1.78.1.jar.sha1 | 1 +
solr/licenses/bcprov-jdk18on-1.77.jar.sha1 | 1 -
solr/licenses/bcprov-jdk18on-1.78.1.jar.sha1 | 1 +
solr/licenses/bcutil-jdk18on-1.77.jar.sha1 | 1 -
solr/licenses/bcutil-jdk18on-1.78.1.jar.sha1 | 1 +
solr/server/etc/security.policy | 1 +
versions.lock | 6 +++---
versions.props | 2 +-
10 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gradle/testing/randomization/policies/solr-tests.policy b/gradle/testing/randomization/policies/solr-tests.policy
index 9dba0b9885d..dae3f218ec3 100644
--- a/gradle/testing/randomization/policies/solr-tests.policy
+++ b/gradle/testing/randomization/policies/solr-tests.policy
@@ -146,6 +146,7 @@ grant {
// Needed by JWT integration tests & S3 tests
permission java.lang.RuntimePermission "setFactory";
+ permission java.security.SecurityPermission "getProperty.org.bouncycastle.pkcs12.default";
permission javax.xml.bind.JAXBPermission "setDatatypeConverter";
diff --git a/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1 b/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1
deleted file mode 100644
index 78f704d21a8..00000000000
--- a/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed953791ba0229747dd0fd9911e3d76a462acfd3
diff --git a/solr/licenses/bcpkix-jdk18on-1.78.1.jar.sha1 b/solr/licenses/bcpkix-jdk18on-1.78.1.jar.sha1
new file mode 100644
index 00000000000..c2cbeb4f70e
--- /dev/null
+++ b/solr/licenses/bcpkix-jdk18on-1.78.1.jar.sha1
@@ -0,0 +1 @@
+17b3541f736df97465f87d9f5b5dfa4991b37bb3
diff --git a/solr/licenses/bcprov-jdk18on-1.77.jar.sha1 b/solr/licenses/bcprov-jdk18on-1.77.jar.sha1
deleted file mode 100644
index 72d478f021a..00000000000
--- a/solr/licenses/bcprov-jdk18on-1.77.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2cc971b6c20949c1ff98d1a4bc741ee848a09523
diff --git a/solr/licenses/bcprov-jdk18on-1.78.1.jar.sha1 b/solr/licenses/bcprov-jdk18on-1.78.1.jar.sha1
new file mode 100644
index 00000000000..9e07e9f1e29
--- /dev/null
+++ b/solr/licenses/bcprov-jdk18on-1.78.1.jar.sha1
@@ -0,0 +1 @@
+39e9e45359e20998eb79c1828751f94a818d25f8
diff --git a/solr/licenses/bcutil-jdk18on-1.77.jar.sha1 b/solr/licenses/bcutil-jdk18on-1.77.jar.sha1
deleted file mode 100644
index 003ab86c340..00000000000
--- a/solr/licenses/bcutil-jdk18on-1.77.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-de3eaef351545fe8562cf29ddff4a403a45b49b7
diff --git a/solr/licenses/bcutil-jdk18on-1.78.1.jar.sha1 b/solr/licenses/bcutil-jdk18on-1.78.1.jar.sha1
new file mode 100644
index 00000000000..d9347e30964
--- /dev/null
+++ b/solr/licenses/bcutil-jdk18on-1.78.1.jar.sha1
@@ -0,0 +1 @@
+5353ca39fe2f148dab9ca1d637a43d0750456254
diff --git a/solr/server/etc/security.policy b/solr/server/etc/security.policy
index f207380fdfb..c898ac8dbfe 100644
--- a/solr/server/etc/security.policy
+++ b/solr/server/etc/security.policy
@@ -147,6 +147,7 @@ grant {
// Needed by JWT integration tests & S3 clients
permission java.lang.RuntimePermission "setFactory";
+ permission java.security.SecurityPermission "getProperty.org.bouncycastle.pkcs12.default";
permission javax.xml.bind.JAXBPermission "setDatatypeConverter";
diff --git a/versions.lock b/versions.lock
index 368a7c1e3b5..baaac4d45f9 100644
--- a/versions.lock
+++ b/versions.lock
@@ -436,9 +436,9 @@ org.apache.kerby:kerb-identity:1.0.1 (1 constraints: 5f0cb602)
org.apache.kerby:kerb-server:1.0.1 (1 constraints: d10b65f2)
org.apache.kerby:kerb-simplekdc:1.0.1 (1 constraints: dc0d7e3e)
org.apache.tomcat.embed:tomcat-embed-el:9.0.76 (1 constraints: d41558cf)
-org.bouncycastle:bcpkix-jdk18on:1.77 (1 constraints: e3040431)
-org.bouncycastle:bcprov-jdk18on:1.77 (2 constraints: c51a825c)
-org.bouncycastle:bcutil-jdk18on:1.77 (1 constraints: 620d2d29)
+org.bouncycastle:bcpkix-jdk18on:1.78.1 (1 constraints: 43055a3b)
+org.bouncycastle:bcprov-jdk18on:1.78.1 (2 constraints: 851b50bd)
+org.bouncycastle:bcutil-jdk18on:1.78.1 (1 constraints: c20d8144)
org.freemarker:freemarker:2.3.32 (1 constraints: f00e9371)
org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 520d2029)
org.hsqldb:hsqldb:2.7.2 (1 constraints: 0d050c36)
diff --git a/versions.props b/versions.props
index 90cdfabd5e6..4d81ec843f6 100644
--- a/versions.props
+++ b/versions.props
@@ -55,7 +55,7 @@ org.apache.tika:*=1.28.5
org.apache.tomcat:annotations-api=6.0.53
org.apache.zookeeper:*=3.9.2
org.bitbucket.b_c:jose4j=0.9.6
-org.bouncycastle:bcpkix-jdk18on=1.77
+org.bouncycastle:bcpkix-jdk18on=1.78.1
org.carrot2:carrot2-core=4.5.1
org.codehaus.woodstox:stax2-api=4.2.2
org.eclipse.jetty*:*=10.0.22