This is an automated email from the ASF dual-hosted git repository.
jdyer pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 686700b96ed SOLR-15484: use latest version of bouncycastle libraries
(#2145)
686700b96ed is described below
commit 686700b96edab4ee35199015297cd27c5ddca4a2
Author: James Dyer <[email protected]>
AuthorDate: Tue Dec 12 08:23:59 2023 -0600
SOLR-15484: use latest version of bouncycastle libraries (#2145)
---
gradle/testing/randomization/policies/solr-tests.policy | 1 +
solr/licenses/bcpkix-jdk18on-1.77.jar.sha1 | 1 +
solr/licenses/bcprov-jdk18on-1.77.jar.sha1 | 1 +
.../{bcutil-jdk15on-LICENSE-BSD_LIKE.txt => bcutil-LICENSE-MIT.txt} | 0
solr/licenses/bcutil-jdk18on-1.77.jar.sha1 | 1 +
.../licenses/{bcutil-jdk15on-NOTICE.txt => bcutil-jdk18on-NOTICE.txt} | 0
solr/modules/jwt-auth/build.gradle | 4 ++--
versions.lock | 3 +++
versions.props | 1 +
9 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/gradle/testing/randomization/policies/solr-tests.policy
b/gradle/testing/randomization/policies/solr-tests.policy
index 86871e72613..c4b07f8ac1a 100644
--- a/gradle/testing/randomization/policies/solr-tests.policy
+++ b/gradle/testing/randomization/policies/solr-tests.policy
@@ -164,6 +164,7 @@ grant {
// Needed by BouncyCastle in jwt-auth tests
permission java.security.SecurityPermission "putProviderProperty.BC";
+ permission java.security.SecurityPermission "removeProviderProperty.BC";
permission java.security.SecurityPermission
"getProperty.org.bouncycastle.x509.allow_non-der_tbscert";
// may only be necessary with Java 7?
diff --git a/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1
b/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1
new file mode 100644
index 00000000000..78f704d21a8
--- /dev/null
+++ b/solr/licenses/bcpkix-jdk18on-1.77.jar.sha1
@@ -0,0 +1 @@
+ed953791ba0229747dd0fd9911e3d76a462acfd3
diff --git a/solr/licenses/bcprov-jdk18on-1.77.jar.sha1
b/solr/licenses/bcprov-jdk18on-1.77.jar.sha1
new file mode 100644
index 00000000000..72d478f021a
--- /dev/null
+++ b/solr/licenses/bcprov-jdk18on-1.77.jar.sha1
@@ -0,0 +1 @@
+2cc971b6c20949c1ff98d1a4bc741ee848a09523
diff --git a/solr/licenses/bcutil-jdk15on-LICENSE-BSD_LIKE.txt
b/solr/licenses/bcutil-LICENSE-MIT.txt
similarity index 100%
rename from solr/licenses/bcutil-jdk15on-LICENSE-BSD_LIKE.txt
rename to solr/licenses/bcutil-LICENSE-MIT.txt
diff --git a/solr/licenses/bcutil-jdk18on-1.77.jar.sha1
b/solr/licenses/bcutil-jdk18on-1.77.jar.sha1
new file mode 100644
index 00000000000..003ab86c340
--- /dev/null
+++ b/solr/licenses/bcutil-jdk18on-1.77.jar.sha1
@@ -0,0 +1 @@
+de3eaef351545fe8562cf29ddff4a403a45b49b7
diff --git a/solr/licenses/bcutil-jdk15on-NOTICE.txt
b/solr/licenses/bcutil-jdk18on-NOTICE.txt
similarity index 100%
rename from solr/licenses/bcutil-jdk15on-NOTICE.txt
rename to solr/licenses/bcutil-jdk18on-NOTICE.txt
diff --git a/solr/modules/jwt-auth/build.gradle
b/solr/modules/jwt-auth/build.gradle
index 17886099e18..c2a4990b5b3 100644
--- a/solr/modules/jwt-auth/build.gradle
+++ b/solr/modules/jwt-auth/build.gradle
@@ -61,8 +61,8 @@ dependencies {
testImplementation 'com.fasterxml.jackson.core:jackson-databind'
permitTestUnusedDeclared 'com.fasterxml.jackson.core:jackson-databind'
- testImplementation 'org.bouncycastle:bcpkix-jdk15on'
- testImplementation 'org.bouncycastle:bcprov-jdk15on'
+ testImplementation 'org.bouncycastle:bcpkix-jdk18on'
+ testImplementation 'org.bouncycastle:bcprov-jdk18on'
testImplementation 'com.nimbusds:nimbus-jose-jwt'
testImplementation 'com.squareup.okhttp3:mockwebserver'
testImplementation 'com.squareup.okhttp3:okhttp'
diff --git a/versions.lock b/versions.lock
index e95bc0f871e..9c0f9ef53d4 100644
--- a/versions.lock
+++ b/versions.lock
@@ -418,6 +418,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.freemarker:freemarker:2.3.32 (1 constraints: f00e9371)
org.glassfish.grizzly:grizzly-framework:2.4.4 (1 constraints: 670fe271)
org.glassfish.grizzly:grizzly-http:2.4.4 (1 constraints: 2b127cf5)
diff --git a/versions.props b/versions.props
index 1a2527610ab..10b583c43e2 100644
--- a/versions.props
+++ b/versions.props
@@ -52,6 +52,7 @@ org.apache.tika:*=1.28.5
org.apache.tomcat:annotations-api=6.0.53
org.apache.zookeeper:*=3.9.1
org.bitbucket.b_c:jose4j=0.9.4
+org.bouncycastle:bcpkix-jdk18on=1.77
org.carrot2:carrot2-core=4.5.1
org.codehaus.woodstox:stax2-api=4.2.2
org.eclipse.jetty*:*=10.0.18
