Skip to content

Commit 595152f

Browse files
authored
Remove nimbus shadow jar (#133602) (#133613)
This shadow jar was necessary for SecurityManager due to its use of gson libraries. However, now that entitlements has replaced security manager, it is no longer needed.
1 parent 61d4408 commit 595152f

File tree

11 files changed

+12
-782
lines changed

11 files changed

+12
-782
lines changed

x-pack/plugin/security/build.gradle

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,7 @@ dependencies {
8181
// Dependencies for oidc
8282
api "com.nimbusds:oauth2-oidc-sdk:11.22.2"
8383
runtimeOnly "com.nimbusds:content-type:2.3"
84-
api project(path: xpackModule('security:lib:nimbus-jose-jwt-modified'), configuration: 'shadow')
85-
if (isEclipse) {
86-
/*
87-
* Eclipse can't pick up the shadow dependency so we point it at the unmodified version of the library
88-
* so it can compile things.
89-
*/
90-
api "com.nimbusds:nimbus-jose-jwt:10.0.2"
91-
}
84+
api "com.nimbusds:nimbus-jose-jwt:10.0.2"
9285
api "com.nimbusds:lang-tag:1.7"
9386
api "com.sun.mail:jakarta.mail:1.6.8"
9487
api "net.jcip:jcip-annotations:1.0"
@@ -185,6 +178,7 @@ tasks.named("dependencyLicenses").configure {
185178
mapping from: /bc.*/, to: 'bouncycastle'
186179
mapping from: /failureaccess.*/, to: 'guava'
187180
mapping from: 'content-type', to: 'nimbus'
181+
mapping from: /nimbus.*/, to: 'nimbus'
188182
}
189183

190184
tasks.named("forbiddenPatterns").configure {
@@ -387,6 +381,16 @@ tasks.named("thirdPartyAudit").configure {
387381
'org.bouncycastle.util.Arrays',
388382
'org.bouncycastle.util.io.Streams',
389383
'org.bouncycastle.cert.X509CertificateHolder',
384+
// missing classes linked by nimbus
385+
'com.google.crypto.tink.subtle.Ed25519Sign',
386+
'com.google.crypto.tink.subtle.Ed25519Sign$KeyPair',
387+
'com.google.crypto.tink.subtle.Ed25519Verify',
388+
'com.google.crypto.tink.subtle.X25519',
389+
'com.google.crypto.tink.subtle.XChaCha20Poly1305',
390+
'org.bouncycastle.cert.jcajce.JcaX509CertificateHolder',
391+
'org.bouncycastle.openssl.PEMKeyPair',
392+
'org.bouncycastle.openssl.PEMParser',
393+
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
390394
)
391395

392396
ignoreViolations(

x-pack/plugin/security/lib/build.gradle

Lines changed: 0 additions & 13 deletions
This file was deleted.

x-pack/plugin/security/lib/nimbus-jose-jwt-modified-part1/build.gradle

Lines changed: 0 additions & 29 deletions
This file was deleted.

x-pack/plugin/security/lib/nimbus-jose-jwt-modified-part1/licenses/nimbus-jose-jwt-LICENSE.txt

Lines changed: 0 additions & 202 deletions
This file was deleted.

x-pack/plugin/security/lib/nimbus-jose-jwt-modified-part1/licenses/nimbus-jose-jwt-NOTICE.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

x-pack/plugin/security/lib/nimbus-jose-jwt-modified-part2/build.gradle

Lines changed: 0 additions & 26 deletions
This file was deleted.

x-pack/plugin/security/lib/nimbus-jose-jwt-modified/build.gradle

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)