Merge 1.5.5 changes back to main.
diff --git a/doc/licenses/jose4j-0.9.5/dep-coordinates.txt b/doc/licenses/jose4j-0.9.5/dep-coordinates.txt
deleted file mode 100644
index ebc0dda..0000000
--- a/doc/licenses/jose4j-0.9.5/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.bitbucket.b_c:jose4j:jar:0.9.5
diff --git a/doc/licenses/jose4j-0.9.5/NOTICE b/doc/licenses/jose4j-0.9.6/NOTICE
similarity index 100%
rename from doc/licenses/jose4j-0.9.5/NOTICE
rename to doc/licenses/jose4j-0.9.6/NOTICE
diff --git a/doc/licenses/jose4j-0.9.5/README b/doc/licenses/jose4j-0.9.6/README
similarity index 90%
rename from doc/licenses/jose4j-0.9.5/README
rename to doc/licenses/jose4j-0.9.6/README
index 57da5b1..d3e549c 100644
--- a/doc/licenses/jose4j-0.9.5/README
+++ b/doc/licenses/jose4j-0.9.6/README
@@ -1,7 +1,7 @@
jose.4.j (https://bitbucket.org/b_c/jose4j/)
--------------------------------------------
- Version: 0.9.5
+ Version: 0.9.6
From: 'Brian Campbell' (https://bitbucket.org/b_c/)
License(s):
Apache v2.0
diff --git a/doc/licenses/jose4j-0.9.6/dep-coordinates.txt b/doc/licenses/jose4j-0.9.6/dep-coordinates.txt
new file mode 100644
index 0000000..eca1c8a
--- /dev/null
+++ b/doc/licenses/jose4j-0.9.6/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bitbucket.b_c:jose4j:jar:0.9.6
diff --git a/doc/licenses/woodstox-core-6.5.0/README b/doc/licenses/woodstox-core-5.4.0/README
similarity index 91%
rename from doc/licenses/woodstox-core-6.5.0/README
rename to doc/licenses/woodstox-core-5.4.0/README
index 11e1cf8..400423b 100644
--- a/doc/licenses/woodstox-core-6.5.0/README
+++ b/doc/licenses/woodstox-core-5.4.0/README
@@ -1,7 +1,7 @@
Woodstox Core (https://github.com/FasterXML/woodstox)
------------------------------------------------------
- Version: 6.5.0
+ Version: 5.4.0
From: 'FasterXML, LLC' (http://fasterxml.com/)
License(s):
Apache v2.0
diff --git a/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt b/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
new file mode 100644
index 0000000..e879f95
--- /dev/null
+++ b/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
@@ -0,0 +1 @@
+com.fasterxml.woodstox:woodstox-core:jar:5.4.0
diff --git a/doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt b/doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt
deleted file mode 100644
index 2c0244b..0000000
--- a/doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.fasterxml.woodstox:woodstox-core:jar:6.5.0
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
index 09b4890..f2e0c34 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6</version>
</dependency>
<!-- Guice -->
diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
index 67d11e7..989f46d 100644
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
@@ -122,7 +122,7 @@
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
- <version>6.5.0</version>
+ <version>5.4.0</version>
</dependency>
<!-- Apache XML Security for Java (see exclusions for java-saml) -->
