From df7309c1f3440f016bed357fb45e8b4a2b10bd91 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Fri, 1 Dec 2023 11:05:29 -0800 Subject: [PATCH 1/9] GUACAMOLE-1859: Update Logback to 1.3.14. --- doc/licenses/logback-1.3.11/dep-coordinates.txt | 2 -- doc/licenses/{logback-1.3.11 => logback-1.3.14}/LICENSE.txt | 0 doc/licenses/{logback-1.3.11 => logback-1.3.14}/README | 4 ++-- doc/licenses/logback-1.3.14/dep-coordinates.txt | 2 ++ pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 doc/licenses/logback-1.3.11/dep-coordinates.txt rename doc/licenses/{logback-1.3.11 => logback-1.3.14}/LICENSE.txt (100%) rename doc/licenses/{logback-1.3.11 => logback-1.3.14}/README (63%) create mode 100644 doc/licenses/logback-1.3.14/dep-coordinates.txt diff --git a/doc/licenses/logback-1.3.11/dep-coordinates.txt b/doc/licenses/logback-1.3.11/dep-coordinates.txt deleted file mode 100644 index be16de903..000000000 --- a/doc/licenses/logback-1.3.11/dep-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -ch.qos.logback:logback-classic:jar:1.3.11 -ch.qos.logback:logback-core:jar:1.3.11 diff --git a/doc/licenses/logback-1.3.11/LICENSE.txt b/doc/licenses/logback-1.3.14/LICENSE.txt similarity index 100% rename from doc/licenses/logback-1.3.11/LICENSE.txt rename to doc/licenses/logback-1.3.14/LICENSE.txt diff --git a/doc/licenses/logback-1.3.11/README b/doc/licenses/logback-1.3.14/README similarity index 63% rename from doc/licenses/logback-1.3.11/README rename to doc/licenses/logback-1.3.14/README index a81bdedaf..1e89268a0 100644 --- a/doc/licenses/logback-1.3.11/README +++ b/doc/licenses/logback-1.3.14/README @@ -1,8 +1,8 @@ Logback (http://logback.qos.ch/) -------------------------------- - Version: 1.3.11 + Version: 1.3.14 From: 'QOS.ch Sàrl' (http://qos.ch/) License(s): - EPL v1.0 (bundled/logback-1.3.11/LICENSE.txt) + EPL v1.0 (bundled/logback-1.3.14/LICENSE.txt) diff --git a/doc/licenses/logback-1.3.14/dep-coordinates.txt b/doc/licenses/logback-1.3.14/dep-coordinates.txt new file mode 100644 index 000000000..6bd9a0d01 --- /dev/null +++ b/doc/licenses/logback-1.3.14/dep-coordinates.txt @@ -0,0 +1,2 @@ +ch.qos.logback:logback-classic:jar:1.3.14 +ch.qos.logback:logback-core:jar:1.3.14 diff --git a/pom.xml b/pom.xml index 2a7c04b69..0de2b7f00 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 2.40 5.10.0 4.13.2 - 1.3.11 + 1.3.14 2.0.9 + + com.fasterxml.woodstox woodstox-core + + + + org.apache.santuario + xmlsec + + @@ -93,6 +104,13 @@ 5.4.0 + + + org.apache.santuario + xmlsec + 2.2.6 + + From c4d49f18080bd93f12e768d12850dc508faecba6 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Sat, 2 Dec 2023 21:23:03 -0800 Subject: [PATCH 3/9] GUACAMOLE-1859: Update to Guava 32.1.3. --- doc/licenses/checker-qual-3.33.0/dep-coordinates.txt | 1 - .../{checker-qual-3.33.0 => checker-qual-3.37.0}/LICENSE.txt | 0 .../{checker-qual-3.33.0 => checker-qual-3.37.0}/README | 4 ++-- doc/licenses/checker-qual-3.37.0/dep-coordinates.txt | 1 + doc/licenses/error-prone-2.18.0/dep-coordinates.txt | 1 - .../{error-prone-2.18.0 => error-prone-2.21.1}/README | 2 +- doc/licenses/error-prone-2.21.1/dep-coordinates.txt | 1 + doc/licenses/{guava-32.1.2-jre => guava-32.1.3-jre}/README | 2 +- .../dep-coordinates.txt | 2 +- pom.xml | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 doc/licenses/checker-qual-3.33.0/dep-coordinates.txt rename doc/licenses/{checker-qual-3.33.0 => checker-qual-3.37.0}/LICENSE.txt (100%) rename doc/licenses/{checker-qual-3.33.0 => checker-qual-3.37.0}/README (74%) create mode 100644 doc/licenses/checker-qual-3.37.0/dep-coordinates.txt delete mode 100644 doc/licenses/error-prone-2.18.0/dep-coordinates.txt rename doc/licenses/{error-prone-2.18.0 => error-prone-2.21.1}/README (89%) create mode 100644 doc/licenses/error-prone-2.21.1/dep-coordinates.txt rename doc/licenses/{guava-32.1.2-jre => guava-32.1.3-jre}/README (90%) rename doc/licenses/{guava-32.1.2-jre => guava-32.1.3-jre}/dep-coordinates.txt (76%) diff --git a/doc/licenses/checker-qual-3.33.0/dep-coordinates.txt b/doc/licenses/checker-qual-3.33.0/dep-coordinates.txt deleted file mode 100644 index bb41bc1af..000000000 --- a/doc/licenses/checker-qual-3.33.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.checkerframework:checker-qual:jar:3.33.0 diff --git a/doc/licenses/checker-qual-3.33.0/LICENSE.txt b/doc/licenses/checker-qual-3.37.0/LICENSE.txt similarity index 100% rename from doc/licenses/checker-qual-3.33.0/LICENSE.txt rename to doc/licenses/checker-qual-3.37.0/LICENSE.txt diff --git a/doc/licenses/checker-qual-3.33.0/README b/doc/licenses/checker-qual-3.37.0/README similarity index 74% rename from doc/licenses/checker-qual-3.33.0/README rename to doc/licenses/checker-qual-3.37.0/README index 5d8ac2c11..1b4bd80cd 100644 --- a/doc/licenses/checker-qual-3.33.0/README +++ b/doc/licenses/checker-qual-3.37.0/README @@ -1,8 +1,8 @@ Checker Framework qualifiers (https://checkerframework.org/) ------------------------------------------------------------ - Version: 3.33.0 + Version: 3.37.0 From: 'Checker Framework developers' (https://checkerframework.org/) License(s): - MIT (bundled/checker-qual-3.33.0/LICENSE.txt) + MIT (bundled/checker-qual-3.37.0/LICENSE.txt) diff --git a/doc/licenses/checker-qual-3.37.0/dep-coordinates.txt b/doc/licenses/checker-qual-3.37.0/dep-coordinates.txt new file mode 100644 index 000000000..e6b1b4e78 --- /dev/null +++ b/doc/licenses/checker-qual-3.37.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.checkerframework:checker-qual:jar:3.37.0 diff --git a/doc/licenses/error-prone-2.18.0/dep-coordinates.txt b/doc/licenses/error-prone-2.18.0/dep-coordinates.txt deleted file mode 100644 index 869df4d8d..000000000 --- a/doc/licenses/error-prone-2.18.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.google.errorprone:error_prone_annotations:jar:2.18.0 diff --git a/doc/licenses/error-prone-2.18.0/README b/doc/licenses/error-prone-2.21.1/README similarity index 89% rename from doc/licenses/error-prone-2.18.0/README rename to doc/licenses/error-prone-2.21.1/README index 4b6f9311b..8e1df59bd 100644 --- a/doc/licenses/error-prone-2.18.0/README +++ b/doc/licenses/error-prone-2.21.1/README @@ -1,7 +1,7 @@ Error Prone (https://errorprone.info/) -------------------------------------- - Version: 2.18.0 + Version: 2.21.1 From: 'Google Inc.' (http://www.google.com/) License(s): Apache v2.0 diff --git a/doc/licenses/error-prone-2.21.1/dep-coordinates.txt b/doc/licenses/error-prone-2.21.1/dep-coordinates.txt new file mode 100644 index 000000000..d1e82c949 --- /dev/null +++ b/doc/licenses/error-prone-2.21.1/dep-coordinates.txt @@ -0,0 +1 @@ +com.google.errorprone:error_prone_annotations:jar:2.21.1 diff --git a/doc/licenses/guava-32.1.2-jre/README b/doc/licenses/guava-32.1.3-jre/README similarity index 90% rename from doc/licenses/guava-32.1.2-jre/README rename to doc/licenses/guava-32.1.3-jre/README index affd04226..a7ee36e9e 100644 --- a/doc/licenses/guava-32.1.2-jre/README +++ b/doc/licenses/guava-32.1.3-jre/README @@ -1,7 +1,7 @@ Guava: Google Core Libraries for Java (https://github.com/google/guava) ----------------------------------------------------------------------- - Version: 32.1.2-jre + Version: 32.1.3-jre From: 'Google Inc.' (http://www.google.com/) License(s): Apache v2.0 diff --git a/doc/licenses/guava-32.1.2-jre/dep-coordinates.txt b/doc/licenses/guava-32.1.3-jre/dep-coordinates.txt similarity index 76% rename from doc/licenses/guava-32.1.2-jre/dep-coordinates.txt rename to doc/licenses/guava-32.1.3-jre/dep-coordinates.txt index c71abdf25..a89f87a49 100644 --- a/doc/licenses/guava-32.1.2-jre/dep-coordinates.txt +++ b/doc/licenses/guava-32.1.3-jre/dep-coordinates.txt @@ -1,3 +1,3 @@ com.google.guava:failureaccess:jar:1.0.1 -com.google.guava:guava:jar:32.1.2-jre +com.google.guava:guava:jar:32.1.3-jre com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava diff --git a/pom.xml b/pom.xml index 0de2b7f00..8ba546f68 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ UTF-8 - 32.1.2-jre + 32.1.3-jre 5.1.0 2.6.1 2.15.2 From 6eb687b873e836e35673896c24db788a5c80dc3c Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Sat, 2 Dec 2023 21:27:37 -0800 Subject: [PATCH 4/9] GUACAMOLE-1859: Update to Jackson 2.16.0. --- doc/licenses/{jackson-2.15.2 => jackson-2.16.0}/NOTICE | 0 doc/licenses/{jackson-2.15.2 => jackson-2.16.0}/README | 2 +- .../dep-coordinates.txt | 8 ++++---- doc/licenses/jackson-databind-2.15.2/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- doc/licenses/jackson-databind-2.16.0/dep-coordinates.txt | 1 + pom.xml | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename doc/licenses/{jackson-2.15.2 => jackson-2.16.0}/NOTICE (100%) rename doc/licenses/{jackson-2.15.2 => jackson-2.16.0}/README (90%) rename doc/licenses/{jackson-2.15.2 => jackson-2.16.0}/dep-coordinates.txt (51%) delete mode 100644 doc/licenses/jackson-databind-2.15.2/dep-coordinates.txt rename doc/licenses/{jackson-databind-2.15.2 => jackson-databind-2.16.0}/NOTICE (100%) rename doc/licenses/{jackson-databind-2.15.2 => jackson-databind-2.16.0}/README (91%) create mode 100644 doc/licenses/jackson-databind-2.16.0/dep-coordinates.txt diff --git a/doc/licenses/jackson-2.15.2/NOTICE b/doc/licenses/jackson-2.16.0/NOTICE similarity index 100% rename from doc/licenses/jackson-2.15.2/NOTICE rename to doc/licenses/jackson-2.16.0/NOTICE diff --git a/doc/licenses/jackson-2.15.2/README b/doc/licenses/jackson-2.16.0/README similarity index 90% rename from doc/licenses/jackson-2.15.2/README rename to doc/licenses/jackson-2.16.0/README index cb54aeab6..78b96510d 100644 --- a/doc/licenses/jackson-2.15.2/README +++ b/doc/licenses/jackson-2.16.0/README @@ -1,7 +1,7 @@ Jackson (https://github.com/FasterXML/jackson) ---------------------------------------------- - Version: 2.15.2 + Version: 2.16.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-2.15.2/dep-coordinates.txt b/doc/licenses/jackson-2.16.0/dep-coordinates.txt similarity index 51% rename from doc/licenses/jackson-2.15.2/dep-coordinates.txt rename to doc/licenses/jackson-2.16.0/dep-coordinates.txt index 48439c23c..4b45d1a40 100644 --- a/doc/licenses/jackson-2.15.2/dep-coordinates.txt +++ b/doc/licenses/jackson-2.16.0/dep-coordinates.txt @@ -1,4 +1,4 @@ -com.fasterxml.jackson.core:jackson-core:jar:2.15.2 -com.fasterxml.jackson.core:jackson-annotations:jar:2.15.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.2 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.2 +com.fasterxml.jackson.core:jackson-core:jar:2.16.0 +com.fasterxml.jackson.core:jackson-annotations:jar:2.16.0 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.16.0 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.0 diff --git a/doc/licenses/jackson-databind-2.15.2/dep-coordinates.txt b/doc/licenses/jackson-databind-2.15.2/dep-coordinates.txt deleted file mode 100644 index cc7e868ce..000000000 --- a/doc/licenses/jackson-databind-2.15.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core:jackson-databind:jar:2.15.2 diff --git a/doc/licenses/jackson-databind-2.15.2/NOTICE b/doc/licenses/jackson-databind-2.16.0/NOTICE similarity index 100% rename from doc/licenses/jackson-databind-2.15.2/NOTICE rename to doc/licenses/jackson-databind-2.16.0/NOTICE diff --git a/doc/licenses/jackson-databind-2.15.2/README b/doc/licenses/jackson-databind-2.16.0/README similarity index 91% rename from doc/licenses/jackson-databind-2.15.2/README rename to doc/licenses/jackson-databind-2.16.0/README index 787519e11..cc54a10c0 100644 --- a/doc/licenses/jackson-databind-2.15.2/README +++ b/doc/licenses/jackson-databind-2.16.0/README @@ -1,7 +1,7 @@ Jackson-databind (https://github.com/FasterXML/jackson-databind) ---------------------------------------------- - Version: 2.15.2 + Version: 2.16.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-databind-2.16.0/dep-coordinates.txt b/doc/licenses/jackson-databind-2.16.0/dep-coordinates.txt new file mode 100644 index 000000000..559b2fcc8 --- /dev/null +++ b/doc/licenses/jackson-databind-2.16.0/dep-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core:jackson-databind:jar:2.16.0 diff --git a/pom.xml b/pom.xml index 8ba546f68..2b8b785ef 100644 --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ 32.1.3-jre 5.1.0 2.6.1 - 2.15.2 - 2.15.2 + 2.16.0 + 2.16.0 2.40 5.10.0 4.13.2 From d154b406b12c06ae03da5ecf929f20c40755673c Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Sat, 2 Dec 2023 21:32:40 -0800 Subject: [PATCH 5/9] GUACAMOLE-1859: Update to Jersey 2.41. --- doc/licenses/jersey-2.40/dep-coordinates.txt | 7 ------- doc/licenses/{jersey-2.40 => jersey-2.41}/LICENSE.md | 0 doc/licenses/{jersey-2.40 => jersey-2.41}/README | 4 ++-- doc/licenses/jersey-2.41/dep-coordinates.txt | 7 +++++++ pom.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 doc/licenses/jersey-2.40/dep-coordinates.txt rename doc/licenses/{jersey-2.40 => jersey-2.41}/LICENSE.md (100%) rename doc/licenses/{jersey-2.40 => jersey-2.41}/README (67%) create mode 100644 doc/licenses/jersey-2.41/dep-coordinates.txt diff --git a/doc/licenses/jersey-2.40/dep-coordinates.txt b/doc/licenses/jersey-2.40/dep-coordinates.txt deleted file mode 100644 index 372b779e8..000000000 --- a/doc/licenses/jersey-2.40/dep-coordinates.txt +++ /dev/null @@ -1,7 +0,0 @@ -org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.40 -org.glassfish.jersey.core:jersey-common:jar:2.40 -org.glassfish.jersey.core:jersey-server:jar:2.40 -org.glassfish.jersey.core:jersey-client:jar:2.40 -org.glassfish.jersey.inject:jersey-hk2:jar:2.40 -org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.40 -org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.40 diff --git a/doc/licenses/jersey-2.40/LICENSE.md b/doc/licenses/jersey-2.41/LICENSE.md similarity index 100% rename from doc/licenses/jersey-2.40/LICENSE.md rename to doc/licenses/jersey-2.41/LICENSE.md diff --git a/doc/licenses/jersey-2.40/README b/doc/licenses/jersey-2.41/README similarity index 67% rename from doc/licenses/jersey-2.40/README rename to doc/licenses/jersey-2.41/README index 582c3b99e..814297d5d 100644 --- a/doc/licenses/jersey-2.40/README +++ b/doc/licenses/jersey-2.41/README @@ -1,8 +1,8 @@ Jersey (https://jersey.java.net/) --------------------------------- - Version: 2.40 + Version: 2.41 From: 'Eclipse Foundation' (https://www.eclipse.org/) License(s): - EPL v2.0 (bundled/jersey-2.40/LICENSE.md) + EPL v2.0 (bundled/jersey-2.41/LICENSE.md) diff --git a/doc/licenses/jersey-2.41/dep-coordinates.txt b/doc/licenses/jersey-2.41/dep-coordinates.txt new file mode 100644 index 000000000..09055dbf0 --- /dev/null +++ b/doc/licenses/jersey-2.41/dep-coordinates.txt @@ -0,0 +1,7 @@ +org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.41 +org.glassfish.jersey.core:jersey-common:jar:2.41 +org.glassfish.jersey.core:jersey-server:jar:2.41 +org.glassfish.jersey.core:jersey-client:jar:2.41 +org.glassfish.jersey.inject:jersey-hk2:jar:2.41 +org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.41 +org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.41 diff --git a/pom.xml b/pom.xml index 2b8b785ef..5863c5f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.6.1 2.16.0 2.16.0 - 2.40 + 2.41 5.10.0 4.13.2 1.3.14 From dbbe238cb4bc128f670da803ebe18a04daa43db8 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Sat, 2 Dec 2023 22:31:46 -0800 Subject: [PATCH 6/9] GUACAMOLE-1859: Update to Apache Directory API v2.1.5. --- doc/licenses/apache-commons-1.16.0/NOTICE | 5 ++ .../README | 2 +- .../apache-commons-1.16.0/dep-coordinates.txt | 1 + doc/licenses/apache-commons-codec-1.15/NOTICE | 17 ------ .../dep-coordinates.txt | 1 - .../dep-coordinates.txt | 1 - .../NOTICE | 2 +- .../README | 2 +- .../dep-coordinates.txt | 1 + .../dep-coordinates.txt | 1 - .../NOTICE | 2 +- .../README | 2 +- .../dep-coordinates.txt | 1 + .../apache-mina-2.2.2/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../apache-mina-2.2.3/dep-coordinates.txt | 1 + .../directory-api-2.1.4/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../directory-api-2.1.5/dep-coordinates.txt | 1 + .../snakeyaml-2.0/dep-coordinates.txt | 1 - .../{snakeyaml-2.0 => snakeyaml-2.2}/README | 2 +- .../snakeyaml-2.2/dep-coordinates.txt | 1 + extensions/guacamole-auth-ldap/pom.xml | 20 ++++++- .../modules/guacamole-auth-sso-cas/pom.xml | 18 +++++++ .../modules/guacamole-auth-sso-saml/pom.xml | 53 ++++++++++++++++++- 27 files changed, 107 insertions(+), 34 deletions(-) create mode 100644 doc/licenses/apache-commons-1.16.0/NOTICE rename doc/licenses/{apache-commons-codec-1.15 => apache-commons-1.16.0}/README (92%) create mode 100644 doc/licenses/apache-commons-1.16.0/dep-coordinates.txt delete mode 100644 doc/licenses/apache-commons-codec-1.15/NOTICE delete mode 100644 doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt delete mode 100644 doc/licenses/apache-commons-lang-3.12.0/dep-coordinates.txt rename doc/licenses/{apache-commons-lang-3.12.0 => apache-commons-lang-3.14.0}/NOTICE (70%) rename doc/licenses/{apache-commons-lang-3.12.0 => apache-commons-lang-3.14.0}/README (92%) create mode 100644 doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt delete mode 100644 doc/licenses/apache-commons-pool-2.11.1/dep-coordinates.txt rename doc/licenses/{apache-commons-pool-2.11.1 => apache-commons-pool-2.12.0}/NOTICE (70%) rename doc/licenses/{apache-commons-pool-2.11.1 => apache-commons-pool-2.12.0}/README (92%) create mode 100644 doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt delete mode 100644 doc/licenses/apache-mina-2.2.2/dep-coordinates.txt rename doc/licenses/{apache-mina-2.2.2 => apache-mina-2.2.3}/NOTICE (100%) rename doc/licenses/{apache-mina-2.2.2 => apache-mina-2.2.3}/README (90%) create mode 100644 doc/licenses/apache-mina-2.2.3/dep-coordinates.txt delete mode 100644 doc/licenses/directory-api-2.1.4/dep-coordinates.txt rename doc/licenses/{directory-api-2.1.4 => directory-api-2.1.5}/NOTICE (100%) rename doc/licenses/{directory-api-2.1.4 => directory-api-2.1.5}/README (91%) create mode 100644 doc/licenses/directory-api-2.1.5/dep-coordinates.txt delete mode 100644 doc/licenses/snakeyaml-2.0/dep-coordinates.txt rename doc/licenses/{snakeyaml-2.0 => snakeyaml-2.2}/README (92%) create mode 100644 doc/licenses/snakeyaml-2.2/dep-coordinates.txt diff --git a/doc/licenses/apache-commons-1.16.0/NOTICE b/doc/licenses/apache-commons-1.16.0/NOTICE new file mode 100644 index 000000000..639cd1fb3 --- /dev/null +++ b/doc/licenses/apache-commons-1.16.0/NOTICE @@ -0,0 +1,5 @@ +Apache Commons Codec +Copyright 2002-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/). diff --git a/doc/licenses/apache-commons-codec-1.15/README b/doc/licenses/apache-commons-1.16.0/README similarity index 92% rename from doc/licenses/apache-commons-codec-1.15/README rename to doc/licenses/apache-commons-1.16.0/README index eed5894c9..3a59af752 100644 --- a/doc/licenses/apache-commons-codec-1.15/README +++ b/doc/licenses/apache-commons-1.16.0/README @@ -1,7 +1,7 @@ Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) ----------------------------------------------------------------------- - Version: 1.15 + Version: 1.16.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt b/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt new file mode 100644 index 000000000..9d5153d43 --- /dev/null +++ b/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt @@ -0,0 +1 @@ +commons-codec:commons-codec:jar:1.16.0 diff --git a/doc/licenses/apache-commons-codec-1.15/NOTICE b/doc/licenses/apache-commons-codec-1.15/NOTICE deleted file mode 100644 index 9899d2108..000000000 --- a/doc/licenses/apache-commons-codec-1.15/NOTICE +++ /dev/null @@ -1,17 +0,0 @@ -Apache Commons Codec -Copyright 2002-2020 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (https://www.apache.org/). - -src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java -contains test data from http://aspell.net/test/orig/batch0.tab. -Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) - -=============================================================================== - -The content of package org.apache.commons.codec.language.bm has been translated -from the original php source code available at http://stevemorse.org/phoneticinfo.htm -with permission from the original authors. -Original source copyright: -Copyright (c) 2008 Alexander Beider & Stephen P. Morse. diff --git a/doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt b/doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt deleted file mode 100644 index 29280ea81..000000000 --- a/doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -commons-codec:commons-codec:jar:1.15 diff --git a/doc/licenses/apache-commons-lang-3.12.0/dep-coordinates.txt b/doc/licenses/apache-commons-lang-3.12.0/dep-coordinates.txt deleted file mode 100644 index 512542ce6..000000000 --- a/doc/licenses/apache-commons-lang-3.12.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-lang3:jar:3.12.0 diff --git a/doc/licenses/apache-commons-lang-3.12.0/NOTICE b/doc/licenses/apache-commons-lang-3.14.0/NOTICE similarity index 70% rename from doc/licenses/apache-commons-lang-3.12.0/NOTICE rename to doc/licenses/apache-commons-lang-3.14.0/NOTICE index 3d4c6906a..307ec45cf 100644 --- a/doc/licenses/apache-commons-lang-3.12.0/NOTICE +++ b/doc/licenses/apache-commons-lang-3.14.0/NOTICE @@ -1,5 +1,5 @@ Apache Commons Lang -Copyright 2001-2021 The Apache Software Foundation +Copyright 2001-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/doc/licenses/apache-commons-lang-3.12.0/README b/doc/licenses/apache-commons-lang-3.14.0/README similarity index 92% rename from doc/licenses/apache-commons-lang-3.12.0/README rename to doc/licenses/apache-commons-lang-3.14.0/README index bce46d42b..079e21d57 100644 --- a/doc/licenses/apache-commons-lang-3.12.0/README +++ b/doc/licenses/apache-commons-lang-3.14.0/README @@ -1,7 +1,7 @@ Apache Commons Lang (http://commons.apache.org/proper/commons-lang/) -------------------------------------------------------------------- - Version: 3.12.0 + Version: 3.14.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt b/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt new file mode 100644 index 000000000..3822db1f7 --- /dev/null +++ b/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-lang3:jar:3.14.0 diff --git a/doc/licenses/apache-commons-pool-2.11.1/dep-coordinates.txt b/doc/licenses/apache-commons-pool-2.11.1/dep-coordinates.txt deleted file mode 100644 index c6fd9e945..000000000 --- a/doc/licenses/apache-commons-pool-2.11.1/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-pool2:jar:2.11.1 diff --git a/doc/licenses/apache-commons-pool-2.11.1/NOTICE b/doc/licenses/apache-commons-pool-2.12.0/NOTICE similarity index 70% rename from doc/licenses/apache-commons-pool-2.11.1/NOTICE rename to doc/licenses/apache-commons-pool-2.12.0/NOTICE index 75e95b7cc..2c90b4379 100644 --- a/doc/licenses/apache-commons-pool-2.11.1/NOTICE +++ b/doc/licenses/apache-commons-pool-2.12.0/NOTICE @@ -1,5 +1,5 @@ Apache Commons Pool -Copyright 2001-2021 The Apache Software Foundation +Copyright 2001-2023 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/doc/licenses/apache-commons-pool-2.11.1/README b/doc/licenses/apache-commons-pool-2.12.0/README similarity index 92% rename from doc/licenses/apache-commons-pool-2.11.1/README rename to doc/licenses/apache-commons-pool-2.12.0/README index 730aa886c..18db98e00 100644 --- a/doc/licenses/apache-commons-pool-2.11.1/README +++ b/doc/licenses/apache-commons-pool-2.12.0/README @@ -1,7 +1,7 @@ Apache Commons Pool (http://commons.apache.org/proper/commons-pool/) -------------------------------------------------------------------- - Version: 2.11.1 + Version: 2.12.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt b/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt new file mode 100644 index 000000000..07edda244 --- /dev/null +++ b/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-pool2:jar:2.12.0 diff --git a/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt deleted file mode 100644 index 5bf57abcf..000000000 --- a/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.mina:mina-core:jar:2.2.2 diff --git a/doc/licenses/apache-mina-2.2.2/NOTICE b/doc/licenses/apache-mina-2.2.3/NOTICE similarity index 100% rename from doc/licenses/apache-mina-2.2.2/NOTICE rename to doc/licenses/apache-mina-2.2.3/NOTICE diff --git a/doc/licenses/apache-mina-2.2.2/README b/doc/licenses/apache-mina-2.2.3/README similarity index 90% rename from doc/licenses/apache-mina-2.2.2/README rename to doc/licenses/apache-mina-2.2.3/README index 8fea0f1e9..12b625967 100644 --- a/doc/licenses/apache-mina-2.2.2/README +++ b/doc/licenses/apache-mina-2.2.3/README @@ -1,7 +1,7 @@ Apache Mina (https://mina.apache.org/) -------------------------------------- - Version: 2.2.2 + Version: 2.2.3 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt new file mode 100644 index 000000000..c2d0321f7 --- /dev/null +++ b/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.mina:mina-core:jar:2.2.3 diff --git a/doc/licenses/directory-api-2.1.4/dep-coordinates.txt b/doc/licenses/directory-api-2.1.4/dep-coordinates.txt deleted file mode 100644 index 8d7257210..000000000 --- a/doc/licenses/directory-api-2.1.4/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.directory.api:api-all:jar:2.1.4 diff --git a/doc/licenses/directory-api-2.1.4/NOTICE b/doc/licenses/directory-api-2.1.5/NOTICE similarity index 100% rename from doc/licenses/directory-api-2.1.4/NOTICE rename to doc/licenses/directory-api-2.1.5/NOTICE diff --git a/doc/licenses/directory-api-2.1.4/README b/doc/licenses/directory-api-2.1.5/README similarity index 91% rename from doc/licenses/directory-api-2.1.4/README rename to doc/licenses/directory-api-2.1.5/README index 1ceaa17b4..666bb5630 100644 --- a/doc/licenses/directory-api-2.1.4/README +++ b/doc/licenses/directory-api-2.1.5/README @@ -1,7 +1,7 @@ Apache Directory LDAP API (http://directory.apache.org) ------------------------------------------------------- - Version: 2.1.4 + Version: 2.1.5 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/directory-api-2.1.5/dep-coordinates.txt b/doc/licenses/directory-api-2.1.5/dep-coordinates.txt new file mode 100644 index 000000000..37dc92a9e --- /dev/null +++ b/doc/licenses/directory-api-2.1.5/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.directory.api:api-all:jar:2.1.5 diff --git a/doc/licenses/snakeyaml-2.0/dep-coordinates.txt b/doc/licenses/snakeyaml-2.0/dep-coordinates.txt deleted file mode 100644 index bdfaf14fe..000000000 --- a/doc/licenses/snakeyaml-2.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.yaml:snakeyaml:jar:2.0 diff --git a/doc/licenses/snakeyaml-2.0/README b/doc/licenses/snakeyaml-2.2/README similarity index 92% rename from doc/licenses/snakeyaml-2.0/README rename to doc/licenses/snakeyaml-2.2/README index 429eb9958..a1ce9461e 100644 --- a/doc/licenses/snakeyaml-2.0/README +++ b/doc/licenses/snakeyaml-2.2/README @@ -1,7 +1,7 @@ SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/ ----------------------------------------------------- - Version: 2.0 + Version: 2.2 From: 'Andrey Somov' (https://bitbucket.org/asomov/) License(s): Apache v2.0 diff --git a/doc/licenses/snakeyaml-2.2/dep-coordinates.txt b/doc/licenses/snakeyaml-2.2/dep-coordinates.txt new file mode 100644 index 000000000..94464ca33 --- /dev/null +++ b/doc/licenses/snakeyaml-2.2/dep-coordinates.txt @@ -0,0 +1 @@ +org.yaml:snakeyaml:jar:2.2 diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 1066608fe..2be994ea2 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -51,8 +51,19 @@ org.apache.directory.api api-all - 2.1.4 + 2.1.5 + + + + org.apache.commons + commons-lang3 + + @@ -72,6 +83,13 @@ jackson-dataformat-yaml + + + org.apache.commons + commons-lang3 + 3.14.0 + + diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml index 6acc7aa42..b6b25f767 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml @@ -65,6 +65,17 @@ org.glassfish.jaxb jaxb-core + + + + commons-codec + commons-codec + @@ -118,6 +129,13 @@ 2.3.1 + + + commons-codec + commons-codec + 1.16.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 158632136..c9fa5d20c 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 @@ -94,21 +94,70 @@ xmlsec + + + org.apache.commons + commons-lang3 + + + + + commons-codec + commons-codec + + - + com.fasterxml.woodstox woodstox-core 5.4.0 - + org.apache.santuario xmlsec 2.2.6 + + + + + commons-codec + commons-codec + + + + + + + + org.apache.commons + commons-lang3 + 3.14.0 + + + + + commons-codec + commons-codec + 1.16.0 From 4a3ecdcb51b2262cd39e686bd7519406cab83d89 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Sat, 2 Dec 2023 22:32:46 -0800 Subject: [PATCH 7/9] GUACAMOLE-1859: Update to MyBatis 3.5.14. --- doc/licenses/mybatis-3.5.13/dep-coordinates.txt | 1 - doc/licenses/{mybatis-3.5.13 => mybatis-3.5.14}/NOTICE | 0 doc/licenses/{mybatis-3.5.13 => mybatis-3.5.14}/README | 2 +- doc/licenses/mybatis-3.5.14/dep-coordinates.txt | 1 + .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 doc/licenses/mybatis-3.5.13/dep-coordinates.txt rename doc/licenses/{mybatis-3.5.13 => mybatis-3.5.14}/NOTICE (100%) rename doc/licenses/{mybatis-3.5.13 => mybatis-3.5.14}/README (89%) create mode 100644 doc/licenses/mybatis-3.5.14/dep-coordinates.txt diff --git a/doc/licenses/mybatis-3.5.13/dep-coordinates.txt b/doc/licenses/mybatis-3.5.13/dep-coordinates.txt deleted file mode 100644 index 9da1af714..000000000 --- a/doc/licenses/mybatis-3.5.13/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.mybatis:mybatis:jar:3.5.13 diff --git a/doc/licenses/mybatis-3.5.13/NOTICE b/doc/licenses/mybatis-3.5.14/NOTICE similarity index 100% rename from doc/licenses/mybatis-3.5.13/NOTICE rename to doc/licenses/mybatis-3.5.14/NOTICE diff --git a/doc/licenses/mybatis-3.5.13/README b/doc/licenses/mybatis-3.5.14/README similarity index 89% rename from doc/licenses/mybatis-3.5.13/README rename to doc/licenses/mybatis-3.5.14/README index 11363cae8..3c40c289e 100644 --- a/doc/licenses/mybatis-3.5.13/README +++ b/doc/licenses/mybatis-3.5.14/README @@ -1,7 +1,7 @@ MyBatis (http://www.mybatis.org/mybatis-3/) ------------------------------------------- - Version: 3.5.13 + Version: 3.5.14 From: 'MyBatis' (http://www.mybatis.org/) License(s): Apache v2.0 diff --git a/doc/licenses/mybatis-3.5.14/dep-coordinates.txt b/doc/licenses/mybatis-3.5.14/dep-coordinates.txt new file mode 100644 index 000000000..985222911 --- /dev/null +++ b/doc/licenses/mybatis-3.5.14/dep-coordinates.txt @@ -0,0 +1 @@ +org.mybatis:mybatis:jar:3.5.14 diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml index d7aa96d2d..cc6a78466 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml @@ -57,7 +57,7 @@ org.mybatis mybatis - 3.5.13 + 3.5.14 From 6e43c7f872255867e46941a005a46dc84ffe2399 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Sat, 2 Dec 2023 22:33:38 -0800 Subject: [PATCH 8/9] GUACAMOLE-1859: Update to Kotlin 1.9.21. --- doc/licenses/kotlin-1.9.10/dep-coordinates.txt | 5 ----- doc/licenses/{kotlin-1.9.10 => kotlin-1.9.21}/NOTICE.txt | 0 doc/licenses/{kotlin-1.9.10 => kotlin-1.9.21}/README | 2 +- doc/licenses/kotlin-1.9.21/dep-coordinates.txt | 5 +++++ .../guacamole-vault/modules/guacamole-vault-ksm/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 doc/licenses/kotlin-1.9.10/dep-coordinates.txt rename doc/licenses/{kotlin-1.9.10 => kotlin-1.9.21}/NOTICE.txt (100%) rename doc/licenses/{kotlin-1.9.10 => kotlin-1.9.21}/README (89%) create mode 100644 doc/licenses/kotlin-1.9.21/dep-coordinates.txt diff --git a/doc/licenses/kotlin-1.9.10/dep-coordinates.txt b/doc/licenses/kotlin-1.9.10/dep-coordinates.txt deleted file mode 100644 index 90ed95929..000000000 --- a/doc/licenses/kotlin-1.9.10/dep-coordinates.txt +++ /dev/null @@ -1,5 +0,0 @@ -org.jetbrains.kotlin:kotlin-reflect:jar:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.10 diff --git a/doc/licenses/kotlin-1.9.10/NOTICE.txt b/doc/licenses/kotlin-1.9.21/NOTICE.txt similarity index 100% rename from doc/licenses/kotlin-1.9.10/NOTICE.txt rename to doc/licenses/kotlin-1.9.21/NOTICE.txt diff --git a/doc/licenses/kotlin-1.9.10/README b/doc/licenses/kotlin-1.9.21/README similarity index 89% rename from doc/licenses/kotlin-1.9.10/README rename to doc/licenses/kotlin-1.9.21/README index f7a6a3b7a..dd464946e 100644 --- a/doc/licenses/kotlin-1.9.10/README +++ b/doc/licenses/kotlin-1.9.21/README @@ -1,7 +1,7 @@ Kotlin (https://kotlinlang.org/) -------------------------------- - Version: 1.9.10 + Version: 1.9.21 From: 'JetBrains s.r.o and respective authors and developers' License(s): Apache v2.0 diff --git a/doc/licenses/kotlin-1.9.21/dep-coordinates.txt b/doc/licenses/kotlin-1.9.21/dep-coordinates.txt new file mode 100644 index 000000000..950fd8236 --- /dev/null +++ b/doc/licenses/kotlin-1.9.21/dep-coordinates.txt @@ -0,0 +1,5 @@ +org.jetbrains.kotlin:kotlin-reflect:jar:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.21 diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml index 9f48d01f0..ea09f94e2 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml @@ -38,7 +38,7 @@ - 1.9.10 + 1.9.21 From 0c6b9903ae4769166fbcf961fdcb2cfa7a705915 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Sat, 2 Dec 2023 22:33:53 -0800 Subject: [PATCH 9/9] GUACAMOLE-1859: Update to jUnit 5.10.1. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5863c5f0c..43e19ebee 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 2.16.0 2.16.0 2.41 - 5.10.0 + 5.10.1 4.13.2 1.3.14 2.0.9