Merge 1.5.5 changes back to main.

doc/licenses/jose4j-0.9.5/dep-coordinates.txt

@@ -1 +0,0 @@
-org.bitbucket.b_c:jose4j:jar:0.9.5

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

doc/licenses/jose4j-0.9.6/dep-coordinates.txt

@@ -0,0 +1 @@
+org.bitbucket.b_c:jose4j:jar:0.9.6

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

doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt

@@ -0,0 +1 @@
+com.fasterxml.woodstox:woodstox-core:jar:5.4.0

doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt

@@ -1 +0,0 @@
-com.fasterxml.woodstox:woodstox-core:jar:6.5.0

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 -->

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) -->