Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions x-pack/plugin/security/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,7 @@ dependencies {
// Dependencies for oidc
api "com.nimbusds:oauth2-oidc-sdk:11.22.2"
runtimeOnly "com.nimbusds:content-type:2.3"
api project(path: xpackModule('security:lib:nimbus-jose-jwt-modified'), configuration: 'shadow')
if (isEclipse) {
/*
* Eclipse can't pick up the shadow dependency so we point it at the unmodified version of the library
* so it can compile things.
*/
api "com.nimbusds:nimbus-jose-jwt:10.0.2"
}
api "com.nimbusds:nimbus-jose-jwt:10.0.2"
api "com.nimbusds:lang-tag:1.7"
api "com.sun.mail:jakarta.mail:1.6.8"
api "net.jcip:jcip-annotations:1.0"
Expand Down Expand Up @@ -185,6 +178,7 @@ tasks.named("dependencyLicenses").configure {
mapping from: /bc.*/, to: 'bouncycastle'
mapping from: /failureaccess.*/, to: 'guava'
mapping from: 'content-type', to: 'nimbus'
mapping from: /nimbus.*/, to: 'nimbus'
}

tasks.named("forbiddenPatterns").configure {
Expand Down Expand Up @@ -387,6 +381,16 @@ tasks.named("thirdPartyAudit").configure {
'org.bouncycastle.util.Arrays',
'org.bouncycastle.util.io.Streams',
'org.bouncycastle.cert.X509CertificateHolder',
// missing classes linked by nimbus
'com.google.crypto.tink.subtle.Ed25519Sign',
'com.google.crypto.tink.subtle.Ed25519Sign$KeyPair',
'com.google.crypto.tink.subtle.Ed25519Verify',
'com.google.crypto.tink.subtle.X25519',
'com.google.crypto.tink.subtle.XChaCha20Poly1305',
'org.bouncycastle.cert.jcajce.JcaX509CertificateHolder',
'org.bouncycastle.openssl.PEMKeyPair',
'org.bouncycastle.openssl.PEMParser',
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter'
)

ignoreViolations(
Expand Down
13 changes: 0 additions & 13 deletions x-pack/plugin/security/lib/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

29 changes: 0 additions & 29 deletions x-pack/plugin/security/lib/nimbus-jose-jwt-modified/build.gradle

This file was deleted.

Loading