Skip to content

SOLR-15484: use latest version of bouncycastle libraries #2145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdyer1 merged 3 commits into from
Dec 12, 2023
Merged

SOLR-15484: use latest version of bouncycastle libraries #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24fb700
SOLR-15484
jdyer1 Dec 11, 2023
76156c6
SOLR-15484
jdyer1 Dec 12, 2023
dd67192
Merge branch 'main' into feature/SOLR-15484-bcversion
janhoy Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gradle/testing/randomization/policies/solr-tests.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
1 change: 1 addition & 0 deletions solr/licenses/bcpkix-jdk18on-1.77.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed953791ba0229747dd0fd9911e3d76a462acfd3
1 change: 1 addition & 0 deletions solr/licenses/bcprov-jdk18on-1.77.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2cc971b6c20949c1ff98d1a4bc741ee848a09523
0 ...enses/bcutil-jdk15on-LICENSE-BSD_LIKE.txt → solr/licenses/bcutil-LICENSE-MIT.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions solr/licenses/bcutil-jdk18on-1.77.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
de3eaef351545fe8562cf29ddff4a403a45b49b7
0 solr/licenses/bcutil-jdk15on-NOTICE.txt → solr/licenses/bcutil-jdk18on-NOTICE.txt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions solr/modules/jwt-auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down