From eb608366b768e17390e45cfff8c3396a0977e1b2 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 22 Jan 2025 15:38:14 -0800 Subject: [PATCH 01/10] GUACAMOLE-1956: Update to latest release of KSM Java SDK (v17.0.0). --- doc/licenses/ksm-sdk-16.6.6/dep-coordinates.txt | 1 - doc/licenses/{ksm-sdk-16.6.6 => ksm-sdk-17.0.0}/LICENSE | 2 +- doc/licenses/{ksm-sdk-16.6.6 => ksm-sdk-17.0.0}/README | 4 ++-- doc/licenses/ksm-sdk-17.0.0/dep-coordinates.txt | 1 + .../guacamole-vault/modules/guacamole-vault-ksm/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 doc/licenses/ksm-sdk-16.6.6/dep-coordinates.txt rename doc/licenses/{ksm-sdk-16.6.6 => ksm-sdk-17.0.0}/LICENSE (96%) rename doc/licenses/{ksm-sdk-16.6.6 => ksm-sdk-17.0.0}/README (77%) create mode 100644 doc/licenses/ksm-sdk-17.0.0/dep-coordinates.txt diff --git a/doc/licenses/ksm-sdk-16.6.6/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.6.6/dep-coordinates.txt deleted file mode 100644 index c15933934..000000000 --- a/doc/licenses/ksm-sdk-16.6.6/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.keepersecurity.secrets-manager:core:jar:16.6.6 diff --git a/doc/licenses/ksm-sdk-16.6.6/LICENSE b/doc/licenses/ksm-sdk-17.0.0/LICENSE similarity index 96% rename from doc/licenses/ksm-sdk-16.6.6/LICENSE rename to doc/licenses/ksm-sdk-17.0.0/LICENSE index aa033eda0..b63322a17 100644 --- a/doc/licenses/ksm-sdk-16.6.6/LICENSE +++ b/doc/licenses/ksm-sdk-17.0.0/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Keeper Security +Copyright (c) 2021 Keeper Security Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/doc/licenses/ksm-sdk-16.6.6/README b/doc/licenses/ksm-sdk-17.0.0/README similarity index 77% rename from doc/licenses/ksm-sdk-16.6.6/README rename to doc/licenses/ksm-sdk-17.0.0/README index 82109dbcc..e84f0996b 100644 --- a/doc/licenses/ksm-sdk-16.6.6/README +++ b/doc/licenses/ksm-sdk-17.0.0/README @@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK (https://github.com/Keeper-Security/secrets-manager) ---------------------------------------------------- - Version: 16.6.6 + Version: 17.0.0 From: 'Keeper Security' (https://www.keepersecurity.com/) License(s): - MIT (bundled/ksm-sdk-16.6.6/LICENSE) + MIT (bundled/ksm-sdk-17.0.0/LICENSE) diff --git a/doc/licenses/ksm-sdk-17.0.0/dep-coordinates.txt b/doc/licenses/ksm-sdk-17.0.0/dep-coordinates.txt new file mode 100644 index 000000000..bf11a8fef --- /dev/null +++ b/doc/licenses/ksm-sdk-17.0.0/dep-coordinates.txt @@ -0,0 +1 @@ +com.keepersecurity.secrets-manager:core:jar:17.0.0 diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml index f1544cb98..1668bb52e 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml @@ -60,7 +60,7 @@ com.keepersecurity.secrets-manager core - 16.6.6 + 17.0.0 From 7e3535e7ba0a7fcd0af4cd675dcb63740675c99d Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 22 Jan 2025 16:01:34 -0800 Subject: [PATCH 02/10] GUACAMOLE-1956: Update to latest release of Logback (v1.3.15). --- doc/licenses/logback-1.3.14/dep-coordinates.txt | 2 -- doc/licenses/{logback-1.3.14 => logback-1.3.15}/LICENSE.txt | 0 doc/licenses/{logback-1.3.14 => logback-1.3.15}/README | 4 ++-- doc/licenses/logback-1.3.15/dep-coordinates.txt | 2 ++ pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 doc/licenses/logback-1.3.14/dep-coordinates.txt rename doc/licenses/{logback-1.3.14 => logback-1.3.15}/LICENSE.txt (100%) rename doc/licenses/{logback-1.3.14 => logback-1.3.15}/README (63%) create mode 100644 doc/licenses/logback-1.3.15/dep-coordinates.txt diff --git a/doc/licenses/logback-1.3.14/dep-coordinates.txt b/doc/licenses/logback-1.3.14/dep-coordinates.txt deleted file mode 100644 index 6bd9a0d01..000000000 --- a/doc/licenses/logback-1.3.14/dep-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -ch.qos.logback:logback-classic:jar:1.3.14 -ch.qos.logback:logback-core:jar:1.3.14 diff --git a/doc/licenses/logback-1.3.14/LICENSE.txt b/doc/licenses/logback-1.3.15/LICENSE.txt similarity index 100% rename from doc/licenses/logback-1.3.14/LICENSE.txt rename to doc/licenses/logback-1.3.15/LICENSE.txt diff --git a/doc/licenses/logback-1.3.14/README b/doc/licenses/logback-1.3.15/README similarity index 63% rename from doc/licenses/logback-1.3.14/README rename to doc/licenses/logback-1.3.15/README index 1e89268a0..15c246374 100644 --- a/doc/licenses/logback-1.3.14/README +++ b/doc/licenses/logback-1.3.15/README @@ -1,8 +1,8 @@ Logback (http://logback.qos.ch/) -------------------------------- - Version: 1.3.14 + Version: 1.3.15 From: 'QOS.ch Sàrl' (http://qos.ch/) License(s): - EPL v1.0 (bundled/logback-1.3.14/LICENSE.txt) + EPL v1.0 (bundled/logback-1.3.15/LICENSE.txt) diff --git a/doc/licenses/logback-1.3.15/dep-coordinates.txt b/doc/licenses/logback-1.3.15/dep-coordinates.txt new file mode 100644 index 000000000..6afe7bd87 --- /dev/null +++ b/doc/licenses/logback-1.3.15/dep-coordinates.txt @@ -0,0 +1,2 @@ +ch.qos.logback:logback-classic:jar:1.3.15 +ch.qos.logback:logback-core:jar:1.3.15 diff --git a/pom.xml b/pom.xml index 215ba3a38..fd4ff37ca 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 2.46 5.11.4 4.13.2 - 1.3.14 + 1.3.15 2.0.16 From 9d08bcf4a97b6cba8a2ad1091c81c8a4c579b90c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 4 Mar 2025 02:19:41 -0800 Subject: [PATCH 04/10] GUACAMOLE-1956: Update Jackson to latest compatible (v2.18.3). --- doc/licenses/{jackson-2.18.2 => jackson-2.18.3}/NOTICE | 0 doc/licenses/{jackson-2.18.2 => jackson-2.18.3}/README | 0 .../dep-coordinates.txt | 8 ++++---- doc/licenses/jackson-databind-2.18.2/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt | 1 + pom.xml | 4 ++-- 8 files changed, 8 insertions(+), 8 deletions(-) rename doc/licenses/{jackson-2.18.2 => jackson-2.18.3}/NOTICE (100%) rename doc/licenses/{jackson-2.18.2 => jackson-2.18.3}/README (100%) rename doc/licenses/{jackson-2.18.2 => jackson-2.18.3}/dep-coordinates.txt (51%) delete mode 100644 doc/licenses/jackson-databind-2.18.2/dep-coordinates.txt rename doc/licenses/{jackson-databind-2.18.2 => jackson-databind-2.18.3}/NOTICE (100%) rename doc/licenses/{jackson-databind-2.18.2 => jackson-databind-2.18.3}/README (91%) create mode 100644 doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt diff --git a/doc/licenses/jackson-2.18.2/NOTICE b/doc/licenses/jackson-2.18.3/NOTICE similarity index 100% rename from doc/licenses/jackson-2.18.2/NOTICE rename to doc/licenses/jackson-2.18.3/NOTICE diff --git a/doc/licenses/jackson-2.18.2/README b/doc/licenses/jackson-2.18.3/README similarity index 100% rename from doc/licenses/jackson-2.18.2/README rename to doc/licenses/jackson-2.18.3/README diff --git a/doc/licenses/jackson-2.18.2/dep-coordinates.txt b/doc/licenses/jackson-2.18.3/dep-coordinates.txt similarity index 51% rename from doc/licenses/jackson-2.18.2/dep-coordinates.txt rename to doc/licenses/jackson-2.18.3/dep-coordinates.txt index 4bcf5fd11..61aece5a6 100644 --- a/doc/licenses/jackson-2.18.2/dep-coordinates.txt +++ b/doc/licenses/jackson-2.18.3/dep-coordinates.txt @@ -1,4 +1,4 @@ -com.fasterxml.jackson.core:jackson-core:jar:2.18.2 -com.fasterxml.jackson.core:jackson-annotations:jar:2.18.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.18.2 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.2 +com.fasterxml.jackson.core:jackson-core:jar:2.18.3 +com.fasterxml.jackson.core:jackson-annotations:jar:2.18.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.18.3 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.18.3 diff --git a/doc/licenses/jackson-databind-2.18.2/dep-coordinates.txt b/doc/licenses/jackson-databind-2.18.2/dep-coordinates.txt deleted file mode 100644 index 28d234a25..000000000 --- a/doc/licenses/jackson-databind-2.18.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core:jackson-databind:jar:2.18.2 diff --git a/doc/licenses/jackson-databind-2.18.2/NOTICE b/doc/licenses/jackson-databind-2.18.3/NOTICE similarity index 100% rename from doc/licenses/jackson-databind-2.18.2/NOTICE rename to doc/licenses/jackson-databind-2.18.3/NOTICE diff --git a/doc/licenses/jackson-databind-2.18.2/README b/doc/licenses/jackson-databind-2.18.3/README similarity index 91% rename from doc/licenses/jackson-databind-2.18.2/README rename to doc/licenses/jackson-databind-2.18.3/README index 02488a694..59e4aa9a1 100644 --- a/doc/licenses/jackson-databind-2.18.2/README +++ b/doc/licenses/jackson-databind-2.18.3/README @@ -1,7 +1,7 @@ Jackson-databind (https://github.com/FasterXML/jackson-databind) ---------------------------------------------- - Version: 2.18.2 + Version: 2.18.3 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt b/doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt new file mode 100644 index 000000000..0eec5941a --- /dev/null +++ b/doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core:jackson-databind:jar:2.18.3 diff --git a/pom.xml b/pom.xml index b37a81f1a..897ce724f 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ 5.1.0 2.6.1 5.5.1 - 2.18.2 - 2.18.2 + 2.18.3 + 2.18.3 2.46 5.11.4 4.13.2 From 78990d97dda5fda4cfe64941af72c0d52761b27d Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 22 Jan 2025 16:22:40 -0800 Subject: [PATCH 05/10] GUACAMOLE-1956: Update Bouncy Castle to latest compatible (v1.80). --- doc/licenses/bouncycastle-1.79/dep-coordinates.txt | 3 --- doc/licenses/{bouncycastle-1.79 => bouncycastle-1.80}/LICENSE | 0 doc/licenses/{bouncycastle-1.79 => bouncycastle-1.80}/README | 4 ++-- doc/licenses/bouncycastle-1.80/dep-coordinates.txt | 3 +++ .../guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 doc/licenses/bouncycastle-1.79/dep-coordinates.txt rename doc/licenses/{bouncycastle-1.79 => bouncycastle-1.80}/LICENSE (100%) rename doc/licenses/{bouncycastle-1.79 => bouncycastle-1.80}/README (76%) create mode 100644 doc/licenses/bouncycastle-1.80/dep-coordinates.txt diff --git a/doc/licenses/bouncycastle-1.79/dep-coordinates.txt b/doc/licenses/bouncycastle-1.79/dep-coordinates.txt deleted file mode 100644 index 204551f0c..000000000 --- a/doc/licenses/bouncycastle-1.79/dep-coordinates.txt +++ /dev/null @@ -1,3 +0,0 @@ -org.bouncycastle:bcpkix-jdk15to18:jar:1.79 -org.bouncycastle:bcprov-jdk15to18:jar:1.79 -org.bouncycastle:bcutil-jdk15to18:jar:1.79 diff --git a/doc/licenses/bouncycastle-1.79/LICENSE b/doc/licenses/bouncycastle-1.80/LICENSE similarity index 100% rename from doc/licenses/bouncycastle-1.79/LICENSE rename to doc/licenses/bouncycastle-1.80/LICENSE diff --git a/doc/licenses/bouncycastle-1.79/README b/doc/licenses/bouncycastle-1.80/README similarity index 76% rename from doc/licenses/bouncycastle-1.79/README rename to doc/licenses/bouncycastle-1.80/README index f74cd1c0f..6e9a57a5e 100644 --- a/doc/licenses/bouncycastle-1.79/README +++ b/doc/licenses/bouncycastle-1.80/README @@ -1,7 +1,7 @@ BouncyCastle Crypto (https://www.bouncycastle.org/java.html) ------------------------------------------------------------ - Version: 1.79 + Version: 1.80 From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) License(s): - MIT (bundled/bouncycastle-1.79/LICENSE) + MIT (bundled/bouncycastle-1.80/LICENSE) diff --git a/doc/licenses/bouncycastle-1.80/dep-coordinates.txt b/doc/licenses/bouncycastle-1.80/dep-coordinates.txt new file mode 100644 index 000000000..9c1d76ec8 --- /dev/null +++ b/doc/licenses/bouncycastle-1.80/dep-coordinates.txt @@ -0,0 +1,3 @@ +org.bouncycastle:bcpkix-jdk15to18:jar:1.80 +org.bouncycastle:bcprov-jdk15to18:jar:1.80 +org.bouncycastle:bcutil-jdk15to18:jar:1.80 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 3eae6d75f..93f677e56 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 @@ -79,7 +79,7 @@ @@ -96,7 +96,7 @@ org.bouncycastle bcpkix-jdk15to18 - 1.79 + 1.80 From 51afe5ade8c7ff90b9cf420a5f8043db4eea5589 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 4 Mar 2025 02:25:16 -0800 Subject: [PATCH 06/10] GUACAMOLE-1956: Update BouncyCastle FIPS to latest compatible (v2.1.0). --- doc/licenses/bouncycastle-2.0.0/dep-coordinates.txt | 1 - .../{bouncycastle-2.0.0 => bouncycastle-fips-2.1.0}/LICENSE | 0 .../{bouncycastle-2.0.0 => bouncycastle-fips-2.1.0}/README | 4 ++-- doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt | 1 + .../guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml | 2 +- .../guacamole-vault/modules/guacamole-vault-ksm/pom.xml | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 doc/licenses/bouncycastle-2.0.0/dep-coordinates.txt rename doc/licenses/{bouncycastle-2.0.0 => bouncycastle-fips-2.1.0}/LICENSE (100%) rename doc/licenses/{bouncycastle-2.0.0 => bouncycastle-fips-2.1.0}/README (76%) create mode 100644 doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt diff --git a/doc/licenses/bouncycastle-2.0.0/dep-coordinates.txt b/doc/licenses/bouncycastle-2.0.0/dep-coordinates.txt deleted file mode 100644 index 06444427f..000000000 --- a/doc/licenses/bouncycastle-2.0.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.bouncycastle:bc-fips:jar:2.0.0 diff --git a/doc/licenses/bouncycastle-2.0.0/LICENSE b/doc/licenses/bouncycastle-fips-2.1.0/LICENSE similarity index 100% rename from doc/licenses/bouncycastle-2.0.0/LICENSE rename to doc/licenses/bouncycastle-fips-2.1.0/LICENSE diff --git a/doc/licenses/bouncycastle-2.0.0/README b/doc/licenses/bouncycastle-fips-2.1.0/README similarity index 76% rename from doc/licenses/bouncycastle-2.0.0/README rename to doc/licenses/bouncycastle-fips-2.1.0/README index 525c9995c..0067750d8 100644 --- a/doc/licenses/bouncycastle-2.0.0/README +++ b/doc/licenses/bouncycastle-fips-2.1.0/README @@ -1,7 +1,7 @@ BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java) ----------------------------------------------------------------------- - Version: 2.0.0 + Version: 2.1.0 From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) License(s): - MIT (bundled/bouncycastle-fips-2.0.0/LICENSE) + MIT (bundled/bouncycastle-fips-2.1.0/LICENSE) diff --git a/doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt new file mode 100644 index 000000000..4481ae6f8 --- /dev/null +++ b/doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.bouncycastle:bc-fips:jar:2.1.0 diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml index 479bfdfbd..add3ab6de 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml @@ -142,7 +142,7 @@ org.bouncycastle bc-fips - 2.0.0 + 2.1.0 diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml index 1668bb52e..1eb1fd632 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml @@ -106,7 +106,7 @@ org.bouncycastle bc-fips - 2.0.0 + 2.1.0 From bcdb62fbe7fc9f3a73c08073b5dba614e0a75b4b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 4 Mar 2025 02:26:49 -0800 Subject: [PATCH 07/10] GUACAMOLE-1956: Update BouncyCastle PKIX FIPS to latest compatible (v2.1.9). --- .../bouncycastle-2.0.3/dep-coordinates.txt | 1 - .../dep-coordinates.txt | 1 - .../LICENSE | 0 .../README | 4 +-- .../dep-coordinates.txt | 1 + .../LICENSE | 0 .../README | 4 +-- .../dep-coordinates.txt | 1 + .../modules/guacamole-auth-sso-ssl/pom.xml | 32 ++++++++++++++++--- 9 files changed, 33 insertions(+), 11 deletions(-) delete mode 100644 doc/licenses/bouncycastle-2.0.3/dep-coordinates.txt delete mode 100644 doc/licenses/bouncycastle-pkix-fips-2.0.7/dep-coordinates.txt rename doc/licenses/{bouncycastle-pkix-fips-2.0.7 => bouncycastle-pkix-fips-2.1.9}/LICENSE (100%) rename doc/licenses/{bouncycastle-pkix-fips-2.0.7 => bouncycastle-pkix-fips-2.1.9}/README (75%) create mode 100644 doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt rename doc/licenses/{bouncycastle-2.0.3 => bouncycastle-util-fips-2.1.4}/LICENSE (100%) rename doc/licenses/{bouncycastle-2.0.3 => bouncycastle-util-fips-2.1.4}/README (77%) create mode 100644 doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt diff --git a/doc/licenses/bouncycastle-2.0.3/dep-coordinates.txt b/doc/licenses/bouncycastle-2.0.3/dep-coordinates.txt deleted file mode 100644 index 349d5baa6..000000000 --- a/doc/licenses/bouncycastle-2.0.3/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.bouncycastle:bcutil-fips:jar:2.0.3 diff --git a/doc/licenses/bouncycastle-pkix-fips-2.0.7/dep-coordinates.txt b/doc/licenses/bouncycastle-pkix-fips-2.0.7/dep-coordinates.txt deleted file mode 100644 index dcf2d99bd..000000000 --- a/doc/licenses/bouncycastle-pkix-fips-2.0.7/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.bouncycastle:bcpkix-fips:jar:2.0.7 diff --git a/doc/licenses/bouncycastle-pkix-fips-2.0.7/LICENSE b/doc/licenses/bouncycastle-pkix-fips-2.1.9/LICENSE similarity index 100% rename from doc/licenses/bouncycastle-pkix-fips-2.0.7/LICENSE rename to doc/licenses/bouncycastle-pkix-fips-2.1.9/LICENSE diff --git a/doc/licenses/bouncycastle-pkix-fips-2.0.7/README b/doc/licenses/bouncycastle-pkix-fips-2.1.9/README similarity index 75% rename from doc/licenses/bouncycastle-pkix-fips-2.0.7/README rename to doc/licenses/bouncycastle-pkix-fips-2.1.9/README index de662b69c..aec503630 100644 --- a/doc/licenses/bouncycastle-pkix-fips-2.0.7/README +++ b/doc/licenses/bouncycastle-pkix-fips-2.1.9/README @@ -1,7 +1,7 @@ BouncyCastle PKIX APIs, FIPS Distribution (https://www.bouncycastle.org/fips-java) ----------------------------------------------------------------------- - Version: 2.0.7 + Version: 2.1.9 From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) License(s): - MIT (bundled/bouncycastle-pkix-fips-2.0.7/LICENSE) + MIT (bundled/bouncycastle-pkix-fips-2.1.9/LICENSE) diff --git a/doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt b/doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt new file mode 100644 index 000000000..1dcbd9d54 --- /dev/null +++ b/doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt @@ -0,0 +1 @@ +org.bouncycastle:bcpkix-fips:jar:2.1.9 diff --git a/doc/licenses/bouncycastle-2.0.3/LICENSE b/doc/licenses/bouncycastle-util-fips-2.1.4/LICENSE similarity index 100% rename from doc/licenses/bouncycastle-2.0.3/LICENSE rename to doc/licenses/bouncycastle-util-fips-2.1.4/LICENSE diff --git a/doc/licenses/bouncycastle-2.0.3/README b/doc/licenses/bouncycastle-util-fips-2.1.4/README similarity index 77% rename from doc/licenses/bouncycastle-2.0.3/README rename to doc/licenses/bouncycastle-util-fips-2.1.4/README index 5907874df..a4ed209ae 100644 --- a/doc/licenses/bouncycastle-2.0.3/README +++ b/doc/licenses/bouncycastle-util-fips-2.1.4/README @@ -1,7 +1,7 @@ Bouncy Castle ASN.1 Extension and Utility APIs (https://www.bouncycastle.org/fips-java) ----------------------------------------------------------------------- - Version: 2.0.3 + Version: 2.1.4 From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) License(s): - MIT (bundled/bouncycastle-fips-2.0.3/LICENSE) + MIT (bundled/bouncycastle-fips-2.1.4/LICENSE) diff --git a/doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt b/doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt new file mode 100644 index 000000000..a7704c124 --- /dev/null +++ b/doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt @@ -0,0 +1 @@ +org.bouncycastle:bcutil-fips:jar:2.1.4 diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml index add3ab6de..c4e46aafa 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml @@ -123,17 +123,32 @@ org.bouncycastle bcpkix-fips - 2.0.7 + 2.1.9 - + + org.bouncycastle bc-fips + + + + org.bouncycastle + bcutil-fips + @@ -145,6 +160,13 @@ 2.1.0 + + + org.bouncycastle + bcutil-fips + 2.1.4 + + From 405cf34d63327b4c691015cf08cddc92ab19cbc5 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 22 Jan 2025 16:25:03 -0800 Subject: [PATCH 08/10] GUACAMOLE-1956: Update MyBatis to latest compatible (v3.5.15). --- doc/licenses/mybatis-3.5.17/dep-coordinates.txt | 1 - doc/licenses/{mybatis-3.5.17 => mybatis-3.5.19}/NOTICE | 0 doc/licenses/{mybatis-3.5.17 => mybatis-3.5.19}/README | 2 +- doc/licenses/mybatis-3.5.19/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.17/dep-coordinates.txt rename doc/licenses/{mybatis-3.5.17 => mybatis-3.5.19}/NOTICE (100%) rename doc/licenses/{mybatis-3.5.17 => mybatis-3.5.19}/README (89%) create mode 100644 doc/licenses/mybatis-3.5.19/dep-coordinates.txt diff --git a/doc/licenses/mybatis-3.5.17/dep-coordinates.txt b/doc/licenses/mybatis-3.5.17/dep-coordinates.txt deleted file mode 100644 index c0970b53b..000000000 --- a/doc/licenses/mybatis-3.5.17/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.mybatis:mybatis:jar:3.5.17 diff --git a/doc/licenses/mybatis-3.5.17/NOTICE b/doc/licenses/mybatis-3.5.19/NOTICE similarity index 100% rename from doc/licenses/mybatis-3.5.17/NOTICE rename to doc/licenses/mybatis-3.5.19/NOTICE diff --git a/doc/licenses/mybatis-3.5.17/README b/doc/licenses/mybatis-3.5.19/README similarity index 89% rename from doc/licenses/mybatis-3.5.17/README rename to doc/licenses/mybatis-3.5.19/README index 2eafbc2b8..e40f1f31e 100644 --- a/doc/licenses/mybatis-3.5.17/README +++ b/doc/licenses/mybatis-3.5.19/README @@ -1,7 +1,7 @@ MyBatis (http://www.mybatis.org/mybatis-3/) ------------------------------------------- - Version: 3.5.17 + Version: 3.5.19 From: 'MyBatis' (http://www.mybatis.org/) License(s): Apache v2.0 diff --git a/doc/licenses/mybatis-3.5.19/dep-coordinates.txt b/doc/licenses/mybatis-3.5.19/dep-coordinates.txt new file mode 100644 index 000000000..96066040f --- /dev/null +++ b/doc/licenses/mybatis-3.5.19/dep-coordinates.txt @@ -0,0 +1 @@ +org.mybatis:mybatis:jar:3.5.19 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 640ce4d7f..93dc92823 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.17 + 3.5.19 From 14aadfbc7ad9ac23c8bf5d60d407ea556f2b9400 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 4 Mar 2025 02:28:59 -0800 Subject: [PATCH 09/10] GUACAMOLE-1956: Update MINA to latest compatible (v2.2.4). --- .../apache-mina-2.2.3/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../apache-mina-2.2.4/dep-coordinates.txt | 1 + extensions/guacamole-auth-ldap/pom.xml | 16 ++++++++++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) delete mode 100644 doc/licenses/apache-mina-2.2.3/dep-coordinates.txt rename doc/licenses/{apache-mina-2.2.3 => apache-mina-2.2.4}/NOTICE (100%) rename doc/licenses/{apache-mina-2.2.3 => apache-mina-2.2.4}/README (90%) create mode 100644 doc/licenses/apache-mina-2.2.4/dep-coordinates.txt diff --git a/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt deleted file mode 100644 index c2d0321f7..000000000 --- a/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.mina:mina-core:jar:2.2.3 diff --git a/doc/licenses/apache-mina-2.2.3/NOTICE b/doc/licenses/apache-mina-2.2.4/NOTICE similarity index 100% rename from doc/licenses/apache-mina-2.2.3/NOTICE rename to doc/licenses/apache-mina-2.2.4/NOTICE diff --git a/doc/licenses/apache-mina-2.2.3/README b/doc/licenses/apache-mina-2.2.4/README similarity index 90% rename from doc/licenses/apache-mina-2.2.3/README rename to doc/licenses/apache-mina-2.2.4/README index 12b625967..5c2d8b31a 100644 --- a/doc/licenses/apache-mina-2.2.3/README +++ b/doc/licenses/apache-mina-2.2.4/README @@ -1,7 +1,7 @@ Apache Mina (https://mina.apache.org/) -------------------------------------- - Version: 2.2.3 + Version: 2.2.4 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt new file mode 100644 index 000000000..f61bc9a2c --- /dev/null +++ b/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.mina:mina-core:jar:2.2.4 diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 698c03496..b7ef05e79 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -54,6 +54,15 @@ 2.1.7 + + + org.apache.mina + mina-core + + + + org.apache.mina + mina-core + 2.2.4 + + From e70e362b6b654a7c7e3d2cfcc249ae3f4ac915ff Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 4 Mar 2025 02:29:12 -0800 Subject: [PATCH 10/10] GUACAMOLE-1956: Update to latest JUnit. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 897ce724f..098b38617 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 2.18.3 2.18.3 2.46 - 5.11.4 + 5.12.0 4.13.2 1.3.15 2.0.17