From 8ada1a91c24bf0af530c2728508a4bd209aa31a4 Mon Sep 17 00:00:00 2001 From: Mike Jumper Date: Thu, 11 May 2023 20:53:02 -0700 Subject: [PATCH] GUACAMOLE-1786: Update Java dependencies to latest compatible versions. --- doc/licenses/{jackson-2.14.2 => jackson-2.15.0}/NOTICE | 0 doc/licenses/{jackson-2.14.2 => jackson-2.15.0}/README | 2 +- .../dep-coordinates.txt | 8 ++++---- doc/licenses/jackson-databind-2.14.2/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- doc/licenses/jackson-databind-2.15.0/dep-coordinates.txt | 1 + doc/licenses/{jersey-2.39 => jersey-2.39.1}/LICENSE.md | 0 doc/licenses/{jersey-2.39 => jersey-2.39.1}/README | 4 ++-- doc/licenses/jersey-2.39.1/dep-coordinates.txt | 7 +++++++ doc/licenses/jersey-2.39/dep-coordinates.txt | 7 ------- doc/licenses/logback-1.3.6/dep-coordinates.txt | 2 -- doc/licenses/{logback-1.3.6 => logback-1.3.7}/LICENSE.txt | 0 doc/licenses/{logback-1.3.6 => logback-1.3.7}/README | 4 ++-- doc/licenses/logback-1.3.7/dep-coordinates.txt | 2 ++ doc/licenses/snakeyaml-1.33/dep-coordinates.txt | 1 - doc/licenses/{snakeyaml-1.33 => snakeyaml-2.0}/README | 2 +- doc/licenses/snakeyaml-2.0/dep-coordinates.txt | 1 + pom.xml | 8 ++++---- 19 files changed, 26 insertions(+), 26 deletions(-) rename doc/licenses/{jackson-2.14.2 => jackson-2.15.0}/NOTICE (100%) rename doc/licenses/{jackson-2.14.2 => jackson-2.15.0}/README (90%) rename doc/licenses/{jackson-2.14.2 => jackson-2.15.0}/dep-coordinates.txt (51%) delete mode 100644 doc/licenses/jackson-databind-2.14.2/dep-coordinates.txt rename doc/licenses/{jackson-databind-2.14.2 => jackson-databind-2.15.0}/NOTICE (100%) rename doc/licenses/{jackson-databind-2.14.2 => jackson-databind-2.15.0}/README (91%) create mode 100644 doc/licenses/jackson-databind-2.15.0/dep-coordinates.txt rename doc/licenses/{jersey-2.39 => jersey-2.39.1}/LICENSE.md (100%) rename doc/licenses/{jersey-2.39 => jersey-2.39.1}/README (66%) create mode 100644 doc/licenses/jersey-2.39.1/dep-coordinates.txt delete mode 100644 doc/licenses/jersey-2.39/dep-coordinates.txt delete mode 100644 doc/licenses/logback-1.3.6/dep-coordinates.txt rename doc/licenses/{logback-1.3.6 => logback-1.3.7}/LICENSE.txt (100%) rename doc/licenses/{logback-1.3.6 => logback-1.3.7}/README (63%) create mode 100644 doc/licenses/logback-1.3.7/dep-coordinates.txt delete mode 100644 doc/licenses/snakeyaml-1.33/dep-coordinates.txt rename doc/licenses/{snakeyaml-1.33 => snakeyaml-2.0}/README (91%) create mode 100644 doc/licenses/snakeyaml-2.0/dep-coordinates.txt diff --git a/doc/licenses/jackson-2.14.2/NOTICE b/doc/licenses/jackson-2.15.0/NOTICE similarity index 100% rename from doc/licenses/jackson-2.14.2/NOTICE rename to doc/licenses/jackson-2.15.0/NOTICE diff --git a/doc/licenses/jackson-2.14.2/README b/doc/licenses/jackson-2.15.0/README similarity index 90% rename from doc/licenses/jackson-2.14.2/README rename to doc/licenses/jackson-2.15.0/README index 5cc817e33..d4d0af613 100644 --- a/doc/licenses/jackson-2.14.2/README +++ b/doc/licenses/jackson-2.15.0/README @@ -1,7 +1,7 @@ Jackson (https://github.com/FasterXML/jackson) ---------------------------------------------- - Version: 2.14.2 + Version: 2.15.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-2.14.2/dep-coordinates.txt b/doc/licenses/jackson-2.15.0/dep-coordinates.txt similarity index 51% rename from doc/licenses/jackson-2.14.2/dep-coordinates.txt rename to doc/licenses/jackson-2.15.0/dep-coordinates.txt index 98fc7a454..b8c949fd8 100644 --- a/doc/licenses/jackson-2.14.2/dep-coordinates.txt +++ b/doc/licenses/jackson-2.15.0/dep-coordinates.txt @@ -1,4 +1,4 @@ -com.fasterxml.jackson.core:jackson-core:jar:2.14.2 -com.fasterxml.jackson.core:jackson-annotations:jar:2.14.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.14.2 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.14.2 +com.fasterxml.jackson.core:jackson-core:jar:2.15.0 +com.fasterxml.jackson.core:jackson-annotations:jar:2.15.0 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.0 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.0 diff --git a/doc/licenses/jackson-databind-2.14.2/dep-coordinates.txt b/doc/licenses/jackson-databind-2.14.2/dep-coordinates.txt deleted file mode 100644 index 9a1b98b08..000000000 --- a/doc/licenses/jackson-databind-2.14.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core:jackson-databind:jar:2.14.2 diff --git a/doc/licenses/jackson-databind-2.14.2/NOTICE b/doc/licenses/jackson-databind-2.15.0/NOTICE similarity index 100% rename from doc/licenses/jackson-databind-2.14.2/NOTICE rename to doc/licenses/jackson-databind-2.15.0/NOTICE diff --git a/doc/licenses/jackson-databind-2.14.2/README b/doc/licenses/jackson-databind-2.15.0/README similarity index 91% rename from doc/licenses/jackson-databind-2.14.2/README rename to doc/licenses/jackson-databind-2.15.0/README index 596266775..bafdc00a8 100644 --- a/doc/licenses/jackson-databind-2.14.2/README +++ b/doc/licenses/jackson-databind-2.15.0/README @@ -1,7 +1,7 @@ Jackson-databind (https://github.com/FasterXML/jackson-databind) ---------------------------------------------- - Version: 2.14.2 + Version: 2.15.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-databind-2.15.0/dep-coordinates.txt b/doc/licenses/jackson-databind-2.15.0/dep-coordinates.txt new file mode 100644 index 000000000..efbd76695 --- /dev/null +++ b/doc/licenses/jackson-databind-2.15.0/dep-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core:jackson-databind:jar:2.15.0 diff --git a/doc/licenses/jersey-2.39/LICENSE.md b/doc/licenses/jersey-2.39.1/LICENSE.md similarity index 100% rename from doc/licenses/jersey-2.39/LICENSE.md rename to doc/licenses/jersey-2.39.1/LICENSE.md diff --git a/doc/licenses/jersey-2.39/README b/doc/licenses/jersey-2.39.1/README similarity index 66% rename from doc/licenses/jersey-2.39/README rename to doc/licenses/jersey-2.39.1/README index 567045938..5a51d91b9 100644 --- a/doc/licenses/jersey-2.39/README +++ b/doc/licenses/jersey-2.39.1/README @@ -1,8 +1,8 @@ Jersey (https://jersey.java.net/) --------------------------------- - Version: 2.39 + Version: 2.39.1 From: 'Eclipse Foundation' (https://www.eclipse.org/) License(s): - EPL v2.0 (bundled/jersey-2.38/LICENSE.md) + EPL v2.0 (bundled/jersey-2.39.1/LICENSE.md) diff --git a/doc/licenses/jersey-2.39.1/dep-coordinates.txt b/doc/licenses/jersey-2.39.1/dep-coordinates.txt new file mode 100644 index 000000000..1c59544f2 --- /dev/null +++ b/doc/licenses/jersey-2.39.1/dep-coordinates.txt @@ -0,0 +1,7 @@ +org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.39.1 +org.glassfish.jersey.core:jersey-common:jar:2.39.1 +org.glassfish.jersey.core:jersey-server:jar:2.39.1 +org.glassfish.jersey.core:jersey-client:jar:2.39.1 +org.glassfish.jersey.inject:jersey-hk2:jar:2.39.1 +org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.39.1 +org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.39.1 diff --git a/doc/licenses/jersey-2.39/dep-coordinates.txt b/doc/licenses/jersey-2.39/dep-coordinates.txt deleted file mode 100644 index 2c6544281..000000000 --- a/doc/licenses/jersey-2.39/dep-coordinates.txt +++ /dev/null @@ -1,7 +0,0 @@ -org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.39 -org.glassfish.jersey.core:jersey-common:jar:2.39 -org.glassfish.jersey.core:jersey-server:jar:2.39 -org.glassfish.jersey.core:jersey-client:jar:2.39 -org.glassfish.jersey.inject:jersey-hk2:jar:2.39 -org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.39 -org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.39 diff --git a/doc/licenses/logback-1.3.6/dep-coordinates.txt b/doc/licenses/logback-1.3.6/dep-coordinates.txt deleted file mode 100644 index 756174c33..000000000 --- a/doc/licenses/logback-1.3.6/dep-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -ch.qos.logback:logback-classic:jar:1.3.6 -ch.qos.logback:logback-core:jar:1.3.6 diff --git a/doc/licenses/logback-1.3.6/LICENSE.txt b/doc/licenses/logback-1.3.7/LICENSE.txt similarity index 100% rename from doc/licenses/logback-1.3.6/LICENSE.txt rename to doc/licenses/logback-1.3.7/LICENSE.txt diff --git a/doc/licenses/logback-1.3.6/README b/doc/licenses/logback-1.3.7/README similarity index 63% rename from doc/licenses/logback-1.3.6/README rename to doc/licenses/logback-1.3.7/README index d0dc6c146..20324b3bc 100644 --- a/doc/licenses/logback-1.3.6/README +++ b/doc/licenses/logback-1.3.7/README @@ -1,8 +1,8 @@ Logback (http://logback.qos.ch/) -------------------------------- - Version: 1.3.6 + Version: 1.3.7 From: 'QOS.ch Sàrl' (http://qos.ch/) License(s): - EPL v1.0 (bundled/logback-1.3.6/LICENSE.txt) + EPL v1.0 (bundled/logback-1.3.7/LICENSE.txt) diff --git a/doc/licenses/logback-1.3.7/dep-coordinates.txt b/doc/licenses/logback-1.3.7/dep-coordinates.txt new file mode 100644 index 000000000..c809b078c --- /dev/null +++ b/doc/licenses/logback-1.3.7/dep-coordinates.txt @@ -0,0 +1,2 @@ +ch.qos.logback:logback-classic:jar:1.3.7 +ch.qos.logback:logback-core:jar:1.3.7 diff --git a/doc/licenses/snakeyaml-1.33/dep-coordinates.txt b/doc/licenses/snakeyaml-1.33/dep-coordinates.txt deleted file mode 100644 index e92a7bcf3..000000000 --- a/doc/licenses/snakeyaml-1.33/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.yaml:snakeyaml:jar:1.33 diff --git a/doc/licenses/snakeyaml-1.33/README b/doc/licenses/snakeyaml-2.0/README similarity index 91% rename from doc/licenses/snakeyaml-1.33/README rename to doc/licenses/snakeyaml-2.0/README index e325c6648..429eb9958 100644 --- a/doc/licenses/snakeyaml-1.33/README +++ b/doc/licenses/snakeyaml-2.0/README @@ -1,7 +1,7 @@ SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/ ----------------------------------------------------- - Version: 1.33 + Version: 2.0 From: 'Andrey Somov' (https://bitbucket.org/asomov/) License(s): Apache v2.0 diff --git a/doc/licenses/snakeyaml-2.0/dep-coordinates.txt b/doc/licenses/snakeyaml-2.0/dep-coordinates.txt new file mode 100644 index 000000000..bdfaf14fe --- /dev/null +++ b/doc/licenses/snakeyaml-2.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.yaml:snakeyaml:jar:2.0 diff --git a/pom.xml b/pom.xml index 8144f2836..fa3891b98 100644 --- a/pom.xml +++ b/pom.xml @@ -39,12 +39,12 @@ 31.1-jre 5.1.0 2.6.1 - 2.14.2 - 2.14.2 - 2.39 + 2.15.0 + 2.15.0 + 2.39.1 5.9.2 4.13.2 - 1.3.6 + 1.3.7 2.0.7