From 35195069e6ec66f0d09c6e53d63d6031b902be2b Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Tue, 12 Mar 2024 21:14:52 +0000 Subject: [PATCH 1/2] GUACAMOLE-1905: Revert to java-saml-compatible version of woodstox. --- .../{woodstox-core-6.5.0 => woodstox-core-5.4.0}/README | 2 +- doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt | 1 + doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt | 1 - .../guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename doc/licenses/{woodstox-core-6.5.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.5.0/dep-coordinates.txt 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 11e1cf8ac..400423b3c 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 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.5.0/dep-coordinates.txt b/doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt deleted file mode 100644 index 2c0244b4e..000000000 --- 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-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml index 67d11e748..989f46d77 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 @@ com.fasterxml.woodstox woodstox-core - 6.5.0 + 5.4.0 From dc016e4b9ff36637704a72ab5b5b79acc5a49dc1 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Tue, 12 Mar 2024 21:20:47 +0000 Subject: [PATCH 2/2] GUACAMOLE-1905: Upgrade to jose4j 0.9.6. --- doc/licenses/jose4j-0.9.5/dep-coordinates.txt | 1 - doc/licenses/{jose4j-0.9.5 => jose4j-0.9.6}/NOTICE | 0 doc/licenses/{jose4j-0.9.5 => jose4j-0.9.6}/README | 2 +- doc/licenses/jose4j-0.9.6/dep-coordinates.txt | 1 + .../modules/guacamole-auth-sso-openid/pom.xml | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 doc/licenses/jose4j-0.9.5/dep-coordinates.txt rename doc/licenses/{jose4j-0.9.5 => jose4j-0.9.6}/NOTICE (100%) rename doc/licenses/{jose4j-0.9.5 => jose4j-0.9.6}/README (90%) create mode 100644 doc/licenses/jose4j-0.9.6/dep-coordinates.txt 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 ebc0ddae1..000000000 --- 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 57da5b1f8..d3e549cb5 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 000000000..eca1c8a22 --- /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/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml index 09b489007..f2e0c34cb 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 @@ org.bitbucket.b_c jose4j - 0.9.5 + 0.9.6