From b06b7e4faedf5bc95ec9c2c487e3aa347c5dff53 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Mon, 2 May 2022 18:49:00 +0000 Subject: [PATCH] GUACAMOLE-1594: Update jackson-databind to 2.13.2.1 and bump other dependencies as needed. --- doc/licenses/jackson-2.13.1/dep-coordinates.txt | 5 ----- doc/licenses/{jackson-2.13.1 => jackson-2.13.2}/NOTICE | 0 doc/licenses/{jackson-2.13.1 => jackson-2.13.2}/README | 2 +- doc/licenses/jackson-2.13.2/dep-coordinates.txt | 4 ++++ doc/licenses/jackson-databind-2.13.2.1/NOTICE | 4 ++++ doc/licenses/jackson-databind-2.13.2.1/README | 8 ++++++++ .../jackson-databind-2.13.2.1/dep-coordinates.txt | 1 + doc/licenses/snakeyaml-1.27/README | 8 -------- doc/licenses/snakeyaml-1.27/dep-coordinates.txt | 1 - doc/licenses/snakeyaml-1.28/dep-coordinates.txt | 1 - doc/licenses/{snakeyaml-1.28 => snakeyaml-1.30}/README | 2 +- doc/licenses/snakeyaml-1.30/dep-coordinates.txt | 1 + pom.xml | 5 +++-- 13 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 doc/licenses/jackson-2.13.1/dep-coordinates.txt rename doc/licenses/{jackson-2.13.1 => jackson-2.13.2}/NOTICE (100%) rename doc/licenses/{jackson-2.13.1 => jackson-2.13.2}/README (90%) create mode 100644 doc/licenses/jackson-2.13.2/dep-coordinates.txt create mode 100644 doc/licenses/jackson-databind-2.13.2.1/NOTICE create mode 100644 doc/licenses/jackson-databind-2.13.2.1/README create mode 100644 doc/licenses/jackson-databind-2.13.2.1/dep-coordinates.txt delete mode 100644 doc/licenses/snakeyaml-1.27/README delete mode 100644 doc/licenses/snakeyaml-1.27/dep-coordinates.txt delete mode 100644 doc/licenses/snakeyaml-1.28/dep-coordinates.txt rename doc/licenses/{snakeyaml-1.28 => snakeyaml-1.30}/README (91%) create mode 100644 doc/licenses/snakeyaml-1.30/dep-coordinates.txt diff --git a/doc/licenses/jackson-2.13.1/dep-coordinates.txt b/doc/licenses/jackson-2.13.1/dep-coordinates.txt deleted file mode 100644 index f2cbd8d67..000000000 --- a/doc/licenses/jackson-2.13.1/dep-coordinates.txt +++ /dev/null @@ -1,5 +0,0 @@ -com.fasterxml.jackson.core:jackson-databind:jar:2.13.1 -com.fasterxml.jackson.core:jackson-core:jar:2.13.1 -com.fasterxml.jackson.core:jackson-annotations:jar:2.13.1 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.13.1 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.13.1 diff --git a/doc/licenses/jackson-2.13.1/NOTICE b/doc/licenses/jackson-2.13.2/NOTICE similarity index 100% rename from doc/licenses/jackson-2.13.1/NOTICE rename to doc/licenses/jackson-2.13.2/NOTICE diff --git a/doc/licenses/jackson-2.13.1/README b/doc/licenses/jackson-2.13.2/README similarity index 90% rename from doc/licenses/jackson-2.13.1/README rename to doc/licenses/jackson-2.13.2/README index 5e5ce8eb1..1b2e7efc6 100644 --- a/doc/licenses/jackson-2.13.1/README +++ b/doc/licenses/jackson-2.13.2/README @@ -1,7 +1,7 @@ Jackson (https://github.com/FasterXML/jackson) ---------------------------------------------- - Version: 2.13.1 + Version: 2.13.2 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-2.13.2/dep-coordinates.txt b/doc/licenses/jackson-2.13.2/dep-coordinates.txt new file mode 100644 index 000000000..5a8f7cabc --- /dev/null +++ b/doc/licenses/jackson-2.13.2/dep-coordinates.txt @@ -0,0 +1,4 @@ +com.fasterxml.jackson.core:jackson-core:jar:2.13.2 +com.fasterxml.jackson.core:jackson-annotations:jar:2.13.2 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.13.2 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.13.2 diff --git a/doc/licenses/jackson-databind-2.13.2.1/NOTICE b/doc/licenses/jackson-databind-2.13.2.1/NOTICE new file mode 100644 index 000000000..e0b3fa0ed --- /dev/null +++ b/doc/licenses/jackson-databind-2.13.2.1/NOTICE @@ -0,0 +1,4 @@ +Jackson is a high-performance, Free/Open Source JSON processing library. +It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has +been in development since 2007. +It is currently developed by a community of developers. diff --git a/doc/licenses/jackson-databind-2.13.2.1/README b/doc/licenses/jackson-databind-2.13.2.1/README new file mode 100644 index 000000000..41d421838 --- /dev/null +++ b/doc/licenses/jackson-databind-2.13.2.1/README @@ -0,0 +1,8 @@ +Jackson-databind (https://github.com/FasterXML/jackson-databind) +---------------------------------------------- + + Version: 2.13.2.1 + From: 'FasterXML, LLC' (https://github.com/FasterXML) + License(s): + Apache v2.0 + diff --git a/doc/licenses/jackson-databind-2.13.2.1/dep-coordinates.txt b/doc/licenses/jackson-databind-2.13.2.1/dep-coordinates.txt new file mode 100644 index 000000000..c35811fd8 --- /dev/null +++ b/doc/licenses/jackson-databind-2.13.2.1/dep-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core:jackson-databind:jar:2.13.2.1 diff --git a/doc/licenses/snakeyaml-1.27/README b/doc/licenses/snakeyaml-1.27/README deleted file mode 100644 index 3fcd837d6..000000000 --- a/doc/licenses/snakeyaml-1.27/README +++ /dev/null @@ -1,8 +0,0 @@ -SnakeYAML (https://bitbucket.org/asomov/snakeyaml/) ---------------------------------------------------- - - Version: 1.27 - From: 'Andrey Somov' (https://bitbucket.org/asomov/) - License(s): - Apache v2.0 - diff --git a/doc/licenses/snakeyaml-1.27/dep-coordinates.txt b/doc/licenses/snakeyaml-1.27/dep-coordinates.txt deleted file mode 100644 index d7cbad91a..000000000 --- a/doc/licenses/snakeyaml-1.27/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.yaml:snakeyaml:jar:1.27 diff --git a/doc/licenses/snakeyaml-1.28/dep-coordinates.txt b/doc/licenses/snakeyaml-1.28/dep-coordinates.txt deleted file mode 100644 index 614b28b37..000000000 --- a/doc/licenses/snakeyaml-1.28/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.yaml:snakeyaml:jar:1.28 diff --git a/doc/licenses/snakeyaml-1.28/README b/doc/licenses/snakeyaml-1.30/README similarity index 91% rename from doc/licenses/snakeyaml-1.28/README rename to doc/licenses/snakeyaml-1.30/README index e89d2a8c3..6d0335f75 100644 --- a/doc/licenses/snakeyaml-1.28/README +++ b/doc/licenses/snakeyaml-1.30/README @@ -1,7 +1,7 @@ SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/ ----------------------------------------------------- - Version: 1.28 + Version: 1.30 From: 'Andrey Somov' (https://bitbucket.org/asomov/) License(s): Apache v2.0 diff --git a/doc/licenses/snakeyaml-1.30/dep-coordinates.txt b/doc/licenses/snakeyaml-1.30/dep-coordinates.txt new file mode 100644 index 000000000..d158332f3 --- /dev/null +++ b/doc/licenses/snakeyaml-1.30/dep-coordinates.txt @@ -0,0 +1 @@ +org.yaml:snakeyaml:jar:1.30 diff --git a/pom.xml b/pom.xml index 2dd057056..2ba032085 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,8 @@ 31.0.1-jre 5.0.1 2.6.1 - 2.13.1 + 2.13.2 + 2.13.2.1 2.35 5.8.2 4.13.2 @@ -375,7 +376,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson.version} + ${jackson-databind.version} com.fasterxml.jackson.dataformat