GUACAMOLE-1956: Revert upgrade of SAML dependencies back to latest co…

…mpatible.
apache · Jan 2, 2025 · ce98043 · ce98043
1 parent 333b73c
commit ce98043
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 8 deletions.
diff --git a/doc/licenses/apache-santuario-4.0.2/NOTICE → doc/licenses/apache-santuario-2.2.6/NOTICE b/doc/licenses/apache-santuario-4.0.2/NOTICE → doc/licenses/apache-santuario-2.2.6/NOTICE
diff --git a/doc/licenses/apache-santuario-4.0.2/README → doc/licenses/apache-santuario-2.2.6/README b/doc/licenses/apache-santuario-4.0.2/README → doc/licenses/apache-santuario-2.2.6/README
@@ -1,7 +1,7 @@
 Apache Santuario (https://santuario.apache.org/)
 -------------------------------------------------
 
-    Version: 4.0.2
+    Version: 2.2.6
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
diff --git a/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt b/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.santuario:xmlsec:jar:2.2.6
diff --git a/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt b/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt
diff --git a/doc/licenses/woodstox-core-6.6.0/README → doc/licenses/woodstox-core-5.4.0/README b/doc/licenses/woodstox-core-6.6.0/README → doc/licenses/woodstox-core-5.4.0/README
@@ -1,7 +1,7 @@
 Woodstox Core (https://github.com/FasterXML/woodstox)
 ------------------------------------------------------
 
-    Version: 6.6.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
@@ -0,0 +1 @@
+com.fasterxml.woodstox:woodstox-core:jar:5.4.0
diff --git a/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt b/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt
diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt
diff --git a/...licenses/woodstox-stax2-api-4.2.2/LICENSE → doc/licenses/woodstox-stax2-api-4.2/LICENSE b/...licenses/woodstox-stax2-api-4.2.2/LICENSE → doc/licenses/woodstox-stax2-api-4.2/LICENSE
diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/README → doc/licenses/woodstox-stax2-api-4.2/README b/doc/licenses/woodstox-stax2-api-4.2.2/README → doc/licenses/woodstox-stax2-api-4.2/README
@@ -4,4 +4,4 @@ Woodstox Stax2-API (https://github.com/FasterXML/stax2-api)
     Version: 4.2
     From: 'FasterXML, LLC' (http://fasterxml.com/)
     License(s):
-        BSD Simplified (bundled/woodstox-stax2-api-4.2.2/LICENSE)
+        BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE)
diff --git a/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
@@ -0,0 +1 @@
+org.codehaus.woodstox:stax2-api:jar:4.2
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
@@ -122,14 +122,14 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>6.6.0</version>
+            <version>5.4.0</version>
         </dependency>
 
         <!-- Apache XML Security for Java (see exclusions for java-saml) -->
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>4.0.2</version>
+            <version>2.2.6</version>
             <exclusions>
 
                 <!--
@@ -143,6 +143,11 @@
                     <artifactId>commons-codec</artifactId>
                 </exclusion>
 
+                <exclusion>
+                    <groupId>com.fasterxml.woodstox</groupId>
+                    <artifactId>woodstox-core</artifactId>
+                </exclusion>
+
             </exclusions>
         </dependency>