From ce98043c161f4f4af60a2dbe78c06462c3366cea Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 1 Jan 2025 01:59:35 -0800 Subject: [PATCH] GUACAMOLE-1956: Revert upgrade of SAML dependencies back to latest compatible. --- .../NOTICE | 0 .../README | 2 +- doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt | 1 + doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt | 1 - .../{woodstox-core-6.6.0 => woodstox-core-5.4.0}/README | 2 +- doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt | 1 + doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt | 1 - .../woodstox-stax2-api-4.2.2/dep-coordinates.txt | 1 - .../LICENSE | 0 .../README | 2 +- doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt | 1 + .../modules/guacamole-auth-sso-saml/pom.xml | 9 +++++++-- 12 files changed, 13 insertions(+), 8 deletions(-) rename doc/licenses/{apache-santuario-4.0.2 => apache-santuario-2.2.6}/NOTICE (100%) rename doc/licenses/{apache-santuario-4.0.2 => apache-santuario-2.2.6}/README (91%) create mode 100644 doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt delete mode 100644 doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt rename doc/licenses/{woodstox-core-6.6.0 => woodstox-core-5.4.0}/README (91%) create mode 100644 doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt delete mode 100644 doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt delete mode 100644 doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt rename doc/licenses/{woodstox-stax2-api-4.2.2 => woodstox-stax2-api-4.2}/LICENSE (100%) rename doc/licenses/{woodstox-stax2-api-4.2.2 => woodstox-stax2-api-4.2}/README (75%) create mode 100644 doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt diff --git a/doc/licenses/apache-santuario-4.0.2/NOTICE b/doc/licenses/apache-santuario-2.2.6/NOTICE similarity index 100% rename from doc/licenses/apache-santuario-4.0.2/NOTICE rename to doc/licenses/apache-santuario-2.2.6/NOTICE diff --git a/doc/licenses/apache-santuario-4.0.2/README b/doc/licenses/apache-santuario-2.2.6/README similarity index 91% rename from doc/licenses/apache-santuario-4.0.2/README rename to doc/licenses/apache-santuario-2.2.6/README index a5aa412db..8ccae438d 100644 --- a/doc/licenses/apache-santuario-4.0.2/README +++ b/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 new file mode 100644 index 000000000..0a6929d5b --- /dev/null +++ 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 deleted file mode 100644 index 26dd9249b..000000000 --- a/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.santuario:xmlsec:jar:4.0.2 \ No newline at end of file diff --git a/doc/licenses/woodstox-core-6.6.0/README b/doc/licenses/woodstox-core-5.4.0/README similarity index 91% rename from doc/licenses/woodstox-core-6.6.0/README rename to doc/licenses/woodstox-core-5.4.0/README index 136c40ddd..ad07e9829 100644 --- a/doc/licenses/woodstox-core-6.6.0/README +++ b/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 new file mode 100644 index 000000000..e879f958a --- /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.6.0/dep-coordinates.txt b/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt deleted file mode 100644 index ee286a084..000000000 --- a/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.woodstox:woodstox-core:jar:6.6.0 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 deleted file mode 100644 index 824c5a941..000000000 --- a/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.codehaus.woodstox:stax2-api:jar:4.2.2 diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/LICENSE b/doc/licenses/woodstox-stax2-api-4.2/LICENSE similarity index 100% rename from doc/licenses/woodstox-stax2-api-4.2.2/LICENSE rename to doc/licenses/woodstox-stax2-api-4.2/LICENSE diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/README b/doc/licenses/woodstox-stax2-api-4.2/README similarity index 75% rename from doc/licenses/woodstox-stax2-api-4.2.2/README rename to doc/licenses/woodstox-stax2-api-4.2/README index dbd1b8e70..b2936e350 100644 --- a/doc/licenses/woodstox-stax2-api-4.2.2/README +++ b/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 new file mode 100644 index 000000000..c7bbc763f --- /dev/null +++ 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 index 28b975aee..6622cc179 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,14 +122,14 @@ com.fasterxml.woodstox woodstox-core - 6.6.0 + 5.4.0 org.apache.santuario xmlsec - 4.0.2 + 2.2.6