From 8e5cf7ab1b9173a074b5aeefa7f171427a9ea17c Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Wed, 13 Mar 2024 21:53:04 +0000 Subject: [PATCH] GUACAMOLE-1905: Revert Apache Santuario version for compatibility with reverted Woodstox version. --- .../{apache-santuario-2.3.4 => apache-santuario-2.2.6}/NOTICE | 2 +- .../{apache-santuario-2.3.4 => apache-santuario-2.2.6}/README | 2 +- doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt | 1 + doc/licenses/apache-santuario-2.3.4/dep-coordinates.txt | 1 - .../guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename doc/licenses/{apache-santuario-2.3.4 => apache-santuario-2.2.6}/NOTICE (90%) rename doc/licenses/{apache-santuario-2.3.4 => 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-2.3.4/dep-coordinates.txt diff --git a/doc/licenses/apache-santuario-2.3.4/NOTICE b/doc/licenses/apache-santuario-2.2.6/NOTICE similarity index 90% rename from doc/licenses/apache-santuario-2.3.4/NOTICE rename to doc/licenses/apache-santuario-2.2.6/NOTICE index a9735facb..2635c161a 100644 --- a/doc/licenses/apache-santuario-2.3.4/NOTICE +++ b/doc/licenses/apache-santuario-2.2.6/NOTICE @@ -1,5 +1,5 @@ Apache Santuario - XML Security for Java -Copyright 1999-2024 The Apache Software Foundation +Copyright 1999-2022 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/doc/licenses/apache-santuario-2.3.4/README b/doc/licenses/apache-santuario-2.2.6/README similarity index 91% rename from doc/licenses/apache-santuario-2.3.4/README rename to doc/licenses/apache-santuario-2.2.6/README index de3acccfe..c09059057 100644 --- a/doc/licenses/apache-santuario-2.3.4/README +++ b/doc/licenses/apache-santuario-2.2.6/README @@ -1,7 +1,7 @@ Apache Santuario (https://santuario.apache.org/) ------------------------------------------------- - Version: 2.3.4 + 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-2.3.4/dep-coordinates.txt b/doc/licenses/apache-santuario-2.3.4/dep-coordinates.txt deleted file mode 100644 index 06f2d5f1a..000000000 --- a/doc/licenses/apache-santuario-2.3.4/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.santuario:xmlsec:jar:2.3.4 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 989f46d77..4bd79c751 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 @@ -129,7 +129,7 @@ org.apache.santuario xmlsec - 2.3.4 + 2.2.6