From 27785d6bbd55ff8e8447388f1f636bb631bfe0af Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 May 2025 09:08:11 -0700 Subject: [PATCH 1/3] GUACAMOLE-1956: Update Jackson to latest compatible version (2.19.0). --- doc/licenses/{jackson-2.18.3 => jackson-2.19.0}/NOTICE | 0 doc/licenses/{jackson-2.18.3 => jackson-2.19.0}/README | 2 +- .../dep-coordinates.txt | 8 ++++---- doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt | 1 + doc/licenses/snakeyaml-2.3/dep-coordinates.txt | 1 - doc/licenses/{snakeyaml-2.3 => snakeyaml-2.4}/README | 2 +- doc/licenses/snakeyaml-2.4/dep-coordinates.txt | 1 + pom.xml | 4 ++-- 11 files changed, 11 insertions(+), 11 deletions(-) rename doc/licenses/{jackson-2.18.3 => jackson-2.19.0}/NOTICE (100%) rename doc/licenses/{jackson-2.18.3 => jackson-2.19.0}/README (90%) rename doc/licenses/{jackson-2.18.3 => jackson-2.19.0}/dep-coordinates.txt (51%) delete mode 100644 doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt rename doc/licenses/{jackson-databind-2.18.3 => jackson-databind-2.19.0}/NOTICE (100%) rename doc/licenses/{jackson-databind-2.18.3 => jackson-databind-2.19.0}/README (91%) create mode 100644 doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt delete mode 100644 doc/licenses/snakeyaml-2.3/dep-coordinates.txt rename doc/licenses/{snakeyaml-2.3 => snakeyaml-2.4}/README (92%) create mode 100644 doc/licenses/snakeyaml-2.4/dep-coordinates.txt diff --git a/doc/licenses/jackson-2.18.3/NOTICE b/doc/licenses/jackson-2.19.0/NOTICE similarity index 100% rename from doc/licenses/jackson-2.18.3/NOTICE rename to doc/licenses/jackson-2.19.0/NOTICE diff --git a/doc/licenses/jackson-2.18.3/README b/doc/licenses/jackson-2.19.0/README similarity index 90% rename from doc/licenses/jackson-2.18.3/README rename to doc/licenses/jackson-2.19.0/README index d9a72f4f7..d6b81854b 100644 --- a/doc/licenses/jackson-2.18.3/README +++ b/doc/licenses/jackson-2.19.0/README @@ -1,7 +1,7 @@ Jackson (https://github.com/FasterXML/jackson) ---------------------------------------------- - Version: 2.18.2 + Version: 2.19.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-2.18.3/dep-coordinates.txt b/doc/licenses/jackson-2.19.0/dep-coordinates.txt similarity index 51% rename from doc/licenses/jackson-2.18.3/dep-coordinates.txt rename to doc/licenses/jackson-2.19.0/dep-coordinates.txt index 61aece5a6..61c1512a9 100644 --- a/doc/licenses/jackson-2.18.3/dep-coordinates.txt +++ b/doc/licenses/jackson-2.19.0/dep-coordinates.txt @@ -1,4 +1,4 @@ -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 +com.fasterxml.jackson.core:jackson-core:jar:2.19.0 +com.fasterxml.jackson.core:jackson-annotations:jar:2.19.0 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.19.0 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.19.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 deleted file mode 100644 index 0eec5941a..000000000 --- a/doc/licenses/jackson-databind-2.18.3/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core:jackson-databind:jar:2.18.3 diff --git a/doc/licenses/jackson-databind-2.18.3/NOTICE b/doc/licenses/jackson-databind-2.19.0/NOTICE similarity index 100% rename from doc/licenses/jackson-databind-2.18.3/NOTICE rename to doc/licenses/jackson-databind-2.19.0/NOTICE diff --git a/doc/licenses/jackson-databind-2.18.3/README b/doc/licenses/jackson-databind-2.19.0/README similarity index 91% rename from doc/licenses/jackson-databind-2.18.3/README rename to doc/licenses/jackson-databind-2.19.0/README index 59e4aa9a1..f324643eb 100644 --- a/doc/licenses/jackson-databind-2.18.3/README +++ b/doc/licenses/jackson-databind-2.19.0/README @@ -1,7 +1,7 @@ Jackson-databind (https://github.com/FasterXML/jackson-databind) ---------------------------------------------- - Version: 2.18.3 + Version: 2.19.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt b/doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt new file mode 100644 index 000000000..35007aa2d --- /dev/null +++ b/doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core:jackson-databind:jar:2.19.0 diff --git a/doc/licenses/snakeyaml-2.3/dep-coordinates.txt b/doc/licenses/snakeyaml-2.3/dep-coordinates.txt deleted file mode 100644 index 8377e0b59..000000000 --- a/doc/licenses/snakeyaml-2.3/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.yaml:snakeyaml:jar:2.3 diff --git a/doc/licenses/snakeyaml-2.3/README b/doc/licenses/snakeyaml-2.4/README similarity index 92% rename from doc/licenses/snakeyaml-2.3/README rename to doc/licenses/snakeyaml-2.4/README index 9bd4a5c1f..7ed8a7009 100644 --- a/doc/licenses/snakeyaml-2.3/README +++ b/doc/licenses/snakeyaml-2.4/README @@ -1,7 +1,7 @@ SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/ ----------------------------------------------------- - Version: 2.3 + Version: 2.4 From: 'Andrey Somov' (https://bitbucket.org/asomov/) License(s): Apache v2.0 diff --git a/doc/licenses/snakeyaml-2.4/dep-coordinates.txt b/doc/licenses/snakeyaml-2.4/dep-coordinates.txt new file mode 100644 index 000000000..68c718a0d --- /dev/null +++ b/doc/licenses/snakeyaml-2.4/dep-coordinates.txt @@ -0,0 +1 @@ +org.yaml:snakeyaml:jar:2.4 diff --git a/pom.xml b/pom.xml index 098b38617..d72ce2a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ 5.1.0 2.6.1 5.5.1 - 2.18.3 - 2.18.3 + 2.19.0 + 2.19.0 2.46 5.12.0 4.13.2 From 604234891ffb488df5b3174e16d2ce36651d4d30 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 May 2025 09:08:39 -0700 Subject: [PATCH 2/3] GUACAMOLE-1956: Update JUnit to latest compatible version (5.12.2). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d72ce2a4e..17be9fdd1 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 2.19.0 2.19.0 2.46 - 5.12.0 + 5.12.2 4.13.2 1.3.15 2.0.17 From 9534601d3bf65d075a493bf2c49838237c37d994 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 May 2025 09:14:10 -0700 Subject: [PATCH 3/3] GUACAMOLE-1956: Update Duo SDK to latest compatible (1.3.1). --- doc/licenses/duo-universal-sdk-1.2.0/dep-coordinates.txt | 1 - .../LICENSE | 0 .../README | 4 ++-- doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt | 1 + extensions/guacamole-auth-duo/pom.xml | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 doc/licenses/duo-universal-sdk-1.2.0/dep-coordinates.txt rename doc/licenses/{duo-universal-sdk-1.2.0 => duo-universal-sdk-1.3.1}/LICENSE (100%) rename doc/licenses/{duo-universal-sdk-1.2.0 => duo-universal-sdk-1.3.1}/README (66%) create mode 100644 doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt diff --git a/doc/licenses/duo-universal-sdk-1.2.0/dep-coordinates.txt b/doc/licenses/duo-universal-sdk-1.2.0/dep-coordinates.txt deleted file mode 100644 index 70795a7a4..000000000 --- a/doc/licenses/duo-universal-sdk-1.2.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.duosecurity:duo-universal-sdk:jar:1.2.0 diff --git a/doc/licenses/duo-universal-sdk-1.2.0/LICENSE b/doc/licenses/duo-universal-sdk-1.3.1/LICENSE similarity index 100% rename from doc/licenses/duo-universal-sdk-1.2.0/LICENSE rename to doc/licenses/duo-universal-sdk-1.3.1/LICENSE diff --git a/doc/licenses/duo-universal-sdk-1.2.0/README b/doc/licenses/duo-universal-sdk-1.3.1/README similarity index 66% rename from doc/licenses/duo-universal-sdk-1.2.0/README rename to doc/licenses/duo-universal-sdk-1.3.1/README index 6cdc78466..2e20b107d 100644 --- a/doc/licenses/duo-universal-sdk-1.2.0/README +++ b/doc/licenses/duo-universal-sdk-1.3.1/README @@ -1,8 +1,8 @@ Duo Universal SDK for Java (https://duo.com/docs/duoweb) -------------------------------------------------------- - Version: 1.2.0 + Version: 1.3.1 From: 'Cisco Systems' License(s): - Duo License (bundled/duo-universal-sdk-1.2.0/LICENSE) + Duo License (bundled/duo-universal-sdk-1.3.1/LICENSE) diff --git a/doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt b/doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt new file mode 100644 index 000000000..ba42036aa --- /dev/null +++ b/doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt @@ -0,0 +1 @@ +com.duosecurity:duo-universal-sdk:jar:1.3.1 diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml index afbb5647b..36cd7de9c 100644 --- a/extensions/guacamole-auth-duo/pom.xml +++ b/extensions/guacamole-auth-duo/pom.xml @@ -77,7 +77,7 @@ com.duosecurity duo-universal-sdk - 1.2.0 + 1.3.1 com.squareup.okhttp3