Merge branch 'stable-2.15'
* stable-2.15:
Update spring-core version to 5.1.5.RELEASE
Update pac4j version to 3.6.1
Update opensaml version to 3.4.2
Change-Id: I73826b79b3b57149e1af7f173f41cb2cc09534dc
diff --git a/BUILD b/BUILD
index 7786b50..fce601b 100644
--- a/BUILD
+++ b/BUILD
@@ -8,7 +8,9 @@
],
resources = glob(["src/main/resources/**"]),
deps = [
+ "@commons-collections//jar",
"@cryptacular//jar",
+ "@joda-time//jar",
"@opensaml-core//jar",
"@opensaml-messaging-api//jar",
"@opensaml-messaging-impl//jar",
@@ -30,6 +32,7 @@
"@shibboleth-xmlsectool//jar",
"@spring-core//jar",
"@stax2-api//jar",
+ "@velocity//jar",
"@woodstox-core//jar",
],
)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 6c27689..9cba009 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -7,6 +7,13 @@
PAC4J_VERSION = "3.6.1"
def external_plugin_deps():
+ # Transitive dependency of velocity
+ maven_jar(
+ name = "commons-collections",
+ artifact = "commons-collections:commons-collections:3.2.2",
+ sha1 = "8ad72fe39fa8c91eaaf12aadb21e0c3661fe26d5",
+ )
+
maven_jar(
name = "cryptacular",
artifact = "org.cryptacular:cryptacular:1.2.1",
@@ -14,6 +21,12 @@
)
maven_jar(
+ name = "joda-time",
+ artifact = "joda-time:joda-time:2.9.9",
+ sha1 = "f7b520c458572890807d143670c9b24f4de90897",
+ )
+
+ maven_jar(
name = "opensaml-core",
artifact = "org.opensaml:opensaml-core:" + OPENSAML_VERSION,
sha1 = "d7bfd76283b4b12074f9a6b866ce048d793390a6",
@@ -156,6 +169,12 @@
)
maven_jar(
+ name = "velocity",
+ artifact = "org.apache.velocity:velocity:1.7",
+ sha1 = "2ceb567b8f3f21118ecdec129fe1271dbc09aa7a",
+ )
+
+ maven_jar(
name = "woodstox-core",
artifact = "com.fasterxml.woodstox:woodstox-core:5.0.3",
sha1 = "10aa199207fda142eff01cd61c69244877d71770",
