Skip to content

Commit 4c070a1

Browse files
committed
Update opensaml dependency
Add the maven repository of the shibboleth project in a couple of places ( x-pack:plugin and x-pack:qa subprojects ) so that we can upgrade opensaml and related dependencies to the latest version Relates: elastic#44947
1 parent 6901363 commit 4c070a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+69
-40
lines changed

buildSrc/version.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ joda = 2.10.2
2828
# - distribution/tools/plugin-cli
2929
# - x-pack/plugin/security
3030
bouncycastle = 1.61
31-
31+
# When updating this version, please review all other SAML dependencies in x-pack/plugin/security
32+
opensaml = 3.4.3
3233
# test dependencies
3334
randomizedrunner = 2.7.1
3435
junit = 4.12

x-pack/plugin/build.gradle

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@ apply plugin: 'elasticsearch.rest-test'
44

55
archivesBaseName = 'x-pack'
66

7+
subprojects {
8+
// We define a specific reposiroty 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://build.shibboleth.net/nexus/content/repositories/releases/"
15+
content {
16+
includeGroup "org.opensaml"
17+
includeGroup "net.shibboleth.utilities"
18+
}
19+
}
20+
}
21+
}
722
dependencies {
823
testCompile project(path: xpackModule('core'), configuration: 'testArtifacts')
924
if (isEclipse) {

x-pack/plugin/security/build.gradle

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@ dependencies {
2626
}
2727

2828
compile 'com.unboundid:unboundid-ldapsdk:4.0.8'
29-
compileOnly 'org.bouncycastle:bcprov-jdk15on:1.59'
30-
compileOnly 'org.bouncycastle:bcpkix-jdk15on:1.59'
29+
compileOnly "org.bouncycastle:bcprov-jdk15on:${versions.bouncycastle}"
30+
compileOnly "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}"
3131

3232
// the following are all SAML dependencies - might as well download the whole internet
33-
compile "org.opensaml:opensaml-core:3.3.0"
34-
compile "org.opensaml:opensaml-saml-api:3.3.0"
35-
compile "org.opensaml:opensaml-saml-impl:3.3.0"
36-
compile "org.opensaml:opensaml-messaging-api:3.3.0"
37-
compile "org.opensaml:opensaml-messaging-impl:3.3.0"
38-
compile "org.opensaml:opensaml-security-api:3.3.0"
39-
compile "org.opensaml:opensaml-security-impl:3.3.0"
40-
compile "org.opensaml:opensaml-profile-api:3.3.0"
41-
compile "org.opensaml:opensaml-profile-impl:3.3.0"
42-
compile "org.opensaml:opensaml-xmlsec-api:3.3.0"
43-
compile "org.opensaml:opensaml-xmlsec-impl:3.3.0"
44-
compile "org.opensaml:opensaml-soap-api:3.3.0"
45-
compile "org.opensaml:opensaml-soap-impl:3.3.0"
46-
compile "org.opensaml:opensaml-storage-api:3.3.0"
47-
compile "org.opensaml:opensaml-storage-impl:3.3.0"
48-
compile "net.shibboleth.utilities:java-support:7.3.0"
49-
compile "org.apache.santuario:xmlsec:2.0.8"
33+
compile "org.opensaml:opensaml-core:${versions.opensaml}"
34+
compile "org.opensaml:opensaml-saml-api:${versions.opensaml}"
35+
compile "org.opensaml:opensaml-saml-impl:${versions.opensaml}"
36+
compile "org.opensaml:opensaml-messaging-api:${versions.opensaml}"
37+
compile "org.opensaml:opensaml-messaging-impl:${versions.opensaml}"
38+
compile "org.opensaml:opensaml-security-api:${versions.opensaml}"
39+
compile "org.opensaml:opensaml-security-impl:${versions.opensaml}"
40+
compile "org.opensaml:opensaml-profile-api:${versions.opensaml}"
41+
compile "org.opensaml:opensaml-profile-impl:${versions.opensaml}"
42+
compile "org.opensaml:opensaml-xmlsec-api:${versions.opensaml}"
43+
compile "org.opensaml:opensaml-xmlsec-impl:${versions.opensaml}"
44+
compile "org.opensaml:opensaml-soap-api:${versions.opensaml}"
45+
compile "org.opensaml:opensaml-soap-impl:${versions.opensaml}"
46+
compile "org.opensaml:opensaml-storage-api:${versions.opensaml}"
47+
compile "org.opensaml:opensaml-storage-impl:${versions.opensaml}"
48+
compile "net.shibboleth.utilities:java-support:7.5.0"
49+
compile "org.apache.santuario:xmlsec:2.1.4"
5050
compile "io.dropwizard.metrics:metrics-core:3.2.2"
51-
compile "org.cryptacular:cryptacular:1.2.0"
51+
compile "org.cryptacular:cryptacular:1.2.3"
5252
compile "org.slf4j:slf4j-api:${versions.slf4j}"
5353
compile "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
5454
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"

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+
5540e04eca8dfaa6c3dca6328e7e0417487edcac

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+
406eedd86ea88c1442a6b1c7625a45cf696b9f55

x-pack/plugin/security/licenses/opensaml-messaging-api-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+
18f68283a3729e4355a29936861f6472ab20b2be

x-pack/plugin/security/licenses/opensaml-messaging-impl-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+
d0cd65f2b0a167dc25477245adf5417a8735e132

x-pack/plugin/security/licenses/opensaml-profile-api-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+
8daff1c6b7ff47178054e17e78b0d4b19b622434

x-pack/plugin/security/licenses/opensaml-profile-impl-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+
175bd3d0ba07a17f0222ea799c3971119c9b32b3

x-pack/plugin/security/licenses/opensaml-saml-api-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+
b2c68a7265e8b059ecbfff0ac6525720cd3e1a86

x-pack/plugin/security/licenses/opensaml-saml-impl-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+
c4bce04bec8fd065bbc014a2c4003172ec612ba6

x-pack/plugin/security/licenses/opensaml-security-api-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+
b6878bd144c15612ab899643e561e52f04d332c1

x-pack/plugin/security/licenses/opensaml-security-impl-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+
72edf27dbce57ed29aebab8563a41942f7f15527

x-pack/plugin/security/licenses/opensaml-soap-api-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+
4fe18269fff79f7172d9dbe0d421886282baa434

x-pack/plugin/security/licenses/opensaml-soap-impl-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+
9a1b9bc0ed6a0c62f3f607cc2c1164c76a57303e

x-pack/plugin/security/licenses/opensaml-storage-api-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+
80ff32a3df660fe71527f293a317813c51375dcc

x-pack/plugin/security/licenses/opensaml-storage-impl-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+
da2116186a10ba5e1adecf2445184bf1feb1aa1c

x-pack/plugin/security/licenses/opensaml-xmlsec-api-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+
b7f0f8a9c17997008bcef75a8886faeb5e9d9ea9

x-pack/plugin/security/licenses/opensaml-xmlsec-impl-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+
3dbdf38773a07d37f013dc9a2ecc4d0295a724de

x-pack/plugin/security/licenses/xmlsec-2.0.8.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+
cb43326f02e3e77526c24269c8b5d3cc3f7f6653

x-pack/qa/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,18 @@ subprojects {
2424
include 'rest-api-spec/api/**'
2525
}
2626
}
27+
28+
// We define a specific reposiroty for opensaml since the shibboleth project doesn't publish to maven central and the
29+
// artifacts that are located there are not curated/updated by the project
30+
// see: https://wiki.shibboleth.net/confluence/display/DEV/Use+of+Maven+Central
31+
repositories {
32+
maven {
33+
name "opensaml"
34+
url "https://build.shibboleth.net/nexus/content/repositories/releases/"
35+
content {
36+
includeGroup "org.opensaml"
37+
includeGroup "net.shibboleth.utilities"
38+
}
39+
}
40+
}
2741
}

x-pack/qa/kerberos-tests/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import java.nio.file.Path
22
import java.nio.file.Paths
3-
import java.nio.file.Files
43

54
apply plugin: 'elasticsearch.testclusters'
65
apply plugin: 'elasticsearch.standalone-rest-test'

0 commit comments

Comments
 (0)