Skip to content

Commit df760fe

Browse files
authored
Update opensaml dependency (elastic#44972)
Add a mirror of the maven repository of the shibboleth project and upgrade opensaml and related dependencies to the latest version available version Resolves: elastic#44947
1 parent 642390c commit df760fe

40 files changed

+58
-46
lines changed

buildSrc/version.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ joda = 2.10.4
2929
# - distribution/tools/plugin-cli
3030
# - x-pack/plugin/security
3131
bouncycastle = 1.61
32-
3332
# test dependencies
3433
randomizedrunner = 2.7.1
3534
junit = 4.12

x-pack/build.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ import org.elasticsearch.gradle.precommit.LicenseHeadersTask
44
Project xpackRootProject = project
55

66
subprojects {
7+
8+
// We define a specific repository for opensaml since the shibboleth project doesn't publish to maven central and the
9+
// artifacts that are located there are not curated/updated by the project
10+
// see: https://wiki.shibboleth.net/confluence/display/DEV/Use+of+Maven+Central
11+
repositories {
12+
maven {
13+
name "opensaml"
14+
url "https://artifactory.elstc.co/artifactory/shibboleth-releases/"
15+
content {
16+
includeGroup "org.opensaml"
17+
includeGroup "net.shibboleth.utilities"
18+
includeGroup "net.shibboleth"
19+
}
20+
}
21+
}
22+
723
group = 'org.elasticsearch.plugin'
824
ext.xpackRootProject = xpackRootProject
925
ext.xpackProject = { String projectName -> xpackRootProject.project(projectName) }

x-pack/plugin/security/build.gradle

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ dependencies {
2525
compile 'com.unboundid:unboundid-ldapsdk:4.0.8'
2626

2727
// the following are all SAML dependencies - might as well download the whole internet
28-
compile "org.opensaml:opensaml-core:3.3.0"
29-
compile "org.opensaml:opensaml-saml-api:3.3.0"
30-
compile "org.opensaml:opensaml-saml-impl:3.3.0"
31-
compile "org.opensaml:opensaml-messaging-api:3.3.0"
32-
compile "org.opensaml:opensaml-messaging-impl:3.3.0"
33-
compile "org.opensaml:opensaml-security-api:3.3.0"
34-
compile "org.opensaml:opensaml-security-impl:3.3.0"
35-
compile "org.opensaml:opensaml-profile-api:3.3.0"
36-
compile "org.opensaml:opensaml-profile-impl:3.3.0"
37-
compile "org.opensaml:opensaml-xmlsec-api:3.3.0"
38-
compile "org.opensaml:opensaml-xmlsec-impl:3.3.0"
39-
compile "org.opensaml:opensaml-soap-api:3.3.0"
40-
compile "org.opensaml:opensaml-soap-impl:3.3.0"
41-
compile "org.opensaml:opensaml-storage-api:3.3.0"
42-
compile "org.opensaml:opensaml-storage-impl:3.3.0"
43-
compile "net.shibboleth.utilities:java-support:7.3.0"
44-
compile "org.apache.santuario:xmlsec:2.0.8"
28+
compile "org.opensaml:opensaml-core:3.4.5"
29+
compile "org.opensaml:opensaml-saml-api:3.4.5"
30+
compile "org.opensaml:opensaml-saml-impl:3.4.5"
31+
compile "org.opensaml:opensaml-messaging-api:3.4.5"
32+
compile "org.opensaml:opensaml-messaging-impl:3.4.5"
33+
compile "org.opensaml:opensaml-security-api:3.4.5"
34+
compile "org.opensaml:opensaml-security-impl:3.4.5"
35+
compile "org.opensaml:opensaml-profile-api:3.4.5"
36+
compile "org.opensaml:opensaml-profile-impl:3.4.5"
37+
compile "org.opensaml:opensaml-xmlsec-api:3.4.5"
38+
compile "org.opensaml:opensaml-xmlsec-impl:3.4.5"
39+
compile "org.opensaml:opensaml-soap-api:3.4.5"
40+
compile "org.opensaml:opensaml-soap-impl:3.4.5"
41+
compile "org.opensaml:opensaml-storage-api:3.4.5"
42+
compile "org.opensaml:opensaml-storage-impl:3.4.5"
43+
compile "net.shibboleth.utilities:java-support:7.5.1"
44+
compile "org.apache.santuario:xmlsec:2.1.4"
4545
compile "io.dropwizard.metrics:metrics-core:3.2.2"
46-
compile ("org.cryptacular:cryptacular:1.2.0") {
46+
compile ("org.cryptacular:cryptacular:1.2.3") {
4747
exclude group: 'org.bouncycastle'
4848
}
4949
compile "org.slf4j:slf4j-api:${versions.slf4j}"
@@ -343,7 +343,6 @@ thirdPartyAudit {
343343
'org.bouncycastle.crypto.digests.TigerDigest',
344344
'org.bouncycastle.crypto.digests.WhirlpoolDigest',
345345
'org.bouncycastle.crypto.engines.AESEngine',
346-
'org.bouncycastle.crypto.engines.AESFastEngine',
347346
'org.bouncycastle.crypto.engines.BlowfishEngine',
348347
'org.bouncycastle.crypto.engines.CAST5Engine',
349348
'org.bouncycastle.crypto.engines.CAST6Engine',
@@ -369,6 +368,7 @@ thirdPartyAudit {
369368
'org.bouncycastle.crypto.engines.TwofishEngine',
370369
'org.bouncycastle.crypto.engines.VMPCEngine',
371370
'org.bouncycastle.crypto.engines.XTEAEngine',
371+
'org.bouncycastle.crypto.generators.BCrypt',
372372
'org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator',
373373
'org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator',
374374
'org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator',

x-pack/plugin/security/licenses/cryptacular-1.2.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7b0398d04a68ff7f58657938b3bdc5f2799b4b49

x-pack/plugin/security/licenses/java-support-7.3.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c3fecaa141e8f0fff8a14e6800aefa8155c9b3e8

x-pack/plugin/security/licenses/opensaml-core-3.3.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0958fae127de9e8b0296e6f089c7451b6d5f0846

x-pack/plugin/security/licenses/opensaml-messaging-api-3.3.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)