diff --git a/doc/licenses/apache-commons-text-1.9/NOTICE.txt b/doc/licenses/apache-commons-text-1.10.0/NOTICE.txt similarity index 70% rename from doc/licenses/apache-commons-text-1.9/NOTICE.txt rename to doc/licenses/apache-commons-text-1.10.0/NOTICE.txt index 2731b6259..4e1f8dbb8 100644 --- a/doc/licenses/apache-commons-text-1.9/NOTICE.txt +++ b/doc/licenses/apache-commons-text-1.10.0/NOTICE.txt @@ -1,5 +1,5 @@ Apache Commons Text -Copyright 2014-2020 The Apache Software Foundation +Copyright 2014-2022 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-text-1.9/README b/doc/licenses/apache-commons-text-1.10.0/README similarity index 92% rename from doc/licenses/apache-commons-text-1.9/README rename to doc/licenses/apache-commons-text-1.10.0/README index 943d6202d..75ec334bd 100644 --- a/doc/licenses/apache-commons-text-1.9/README +++ b/doc/licenses/apache-commons-text-1.10.0/README @@ -1,7 +1,7 @@ Apache Commons Text (https://commons.apache.org/proper/commons-text/) --------------------------------------------------------------------- - Version: 1.9 + Version: 1.10.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt b/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt new file mode 100644 index 000000000..221ed51bb --- /dev/null +++ b/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-text:jar:1.10.0 diff --git a/doc/licenses/apache-commons-text-1.9/dep-coordinates.txt b/doc/licenses/apache-commons-text-1.9/dep-coordinates.txt deleted file mode 100644 index ab50b2f30..000000000 --- a/doc/licenses/apache-commons-text-1.9/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-text:jar:1.9 diff --git a/doc/licenses/jackson-2.13.4/NOTICE b/doc/licenses/jackson-2.14.0/NOTICE similarity index 100% rename from doc/licenses/jackson-2.13.4/NOTICE rename to doc/licenses/jackson-2.14.0/NOTICE diff --git a/doc/licenses/jackson-2.13.4/README b/doc/licenses/jackson-2.14.0/README similarity index 90% rename from doc/licenses/jackson-2.13.4/README rename to doc/licenses/jackson-2.14.0/README index 5c0b1f106..42914861b 100644 --- a/doc/licenses/jackson-2.13.4/README +++ b/doc/licenses/jackson-2.14.0/README @@ -1,7 +1,7 @@ Jackson (https://github.com/FasterXML/jackson) ---------------------------------------------- - Version: 2.13.4 + Version: 2.14.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-2.13.4/dep-coordinates.txt b/doc/licenses/jackson-2.14.0/dep-coordinates.txt similarity index 51% rename from doc/licenses/jackson-2.13.4/dep-coordinates.txt rename to doc/licenses/jackson-2.14.0/dep-coordinates.txt index c8839d122..a1d761036 100644 --- a/doc/licenses/jackson-2.13.4/dep-coordinates.txt +++ b/doc/licenses/jackson-2.14.0/dep-coordinates.txt @@ -1,4 +1,4 @@ -com.fasterxml.jackson.core:jackson-core:jar:2.13.4 -com.fasterxml.jackson.core:jackson-annotations:jar:2.13.4 -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.13.4 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.13.4 +com.fasterxml.jackson.core:jackson-core:jar:2.14.0 +com.fasterxml.jackson.core:jackson-annotations:jar:2.14.0 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.14.0 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.14.0 diff --git a/doc/licenses/jackson-databind-2.13.4.2/dep-coordinates.txt b/doc/licenses/jackson-databind-2.13.4.2/dep-coordinates.txt deleted file mode 100644 index 69b36ad4c..000000000 --- a/doc/licenses/jackson-databind-2.13.4.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.jackson.core:jackson-databind:jar:2.13.4.2 diff --git a/doc/licenses/jackson-databind-2.13.4.2/NOTICE b/doc/licenses/jackson-databind-2.14.0/NOTICE similarity index 100% rename from doc/licenses/jackson-databind-2.13.4.2/NOTICE rename to doc/licenses/jackson-databind-2.14.0/NOTICE diff --git a/doc/licenses/jackson-databind-2.13.4.2/README b/doc/licenses/jackson-databind-2.14.0/README similarity index 90% rename from doc/licenses/jackson-databind-2.13.4.2/README rename to doc/licenses/jackson-databind-2.14.0/README index b42d2754c..12092bffa 100644 --- a/doc/licenses/jackson-databind-2.13.4.2/README +++ b/doc/licenses/jackson-databind-2.14.0/README @@ -1,7 +1,7 @@ Jackson-databind (https://github.com/FasterXML/jackson-databind) ---------------------------------------------- - Version: 2.13.4.2 + Version: 2.14.0 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-databind-2.14.0/dep-coordinates.txt b/doc/licenses/jackson-databind-2.14.0/dep-coordinates.txt new file mode 100644 index 000000000..f53d908c8 --- /dev/null +++ b/doc/licenses/jackson-databind-2.14.0/dep-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.jackson.core:jackson-databind:jar:2.14.0 diff --git a/doc/licenses/snakeyaml-1.31/dep-coordinates.txt b/doc/licenses/snakeyaml-1.31/dep-coordinates.txt deleted file mode 100644 index 140ebb787..000000000 --- a/doc/licenses/snakeyaml-1.31/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.yaml:snakeyaml:jar:1.31 diff --git a/doc/licenses/snakeyaml-1.31/README b/doc/licenses/snakeyaml-1.33/README similarity index 91% rename from doc/licenses/snakeyaml-1.31/README rename to doc/licenses/snakeyaml-1.33/README index dbbf20847..e325c6648 100644 --- a/doc/licenses/snakeyaml-1.31/README +++ b/doc/licenses/snakeyaml-1.33/README @@ -1,7 +1,7 @@ SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/ ----------------------------------------------------- - Version: 1.31 + Version: 1.33 From: 'Andrey Somov' (https://bitbucket.org/asomov/) License(s): Apache v2.0 diff --git a/doc/licenses/snakeyaml-1.33/dep-coordinates.txt b/doc/licenses/snakeyaml-1.33/dep-coordinates.txt new file mode 100644 index 000000000..e92a7bcf3 --- /dev/null +++ b/doc/licenses/snakeyaml-1.33/dep-coordinates.txt @@ -0,0 +1 @@ +org.yaml:snakeyaml:jar:1.33 diff --git a/doc/licenses/spring-security-5.7.4/dep-coordinates.txt b/doc/licenses/spring-security-5.7.4/dep-coordinates.txt deleted file mode 100644 index c9c1a30c2..000000000 --- a/doc/licenses/spring-security-5.7.4/dep-coordinates.txt +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.security:spring-security-core:jar:5.7.4 -org.springframework.security:spring-security-crypto:jar:5.7.4 -org.springframework.security:spring-security-web:jar:5.7.4 diff --git a/doc/licenses/spring-security-5.7.4/NOTICE b/doc/licenses/spring-security-5.7.5/NOTICE similarity index 100% rename from doc/licenses/spring-security-5.7.4/NOTICE rename to doc/licenses/spring-security-5.7.5/NOTICE diff --git a/doc/licenses/spring-security-5.7.4/README b/doc/licenses/spring-security-5.7.5/README similarity index 91% rename from doc/licenses/spring-security-5.7.4/README rename to doc/licenses/spring-security-5.7.5/README index c1ed07fe8..44b071797 100644 --- a/doc/licenses/spring-security-5.7.4/README +++ b/doc/licenses/spring-security-5.7.5/README @@ -1,7 +1,7 @@ Spring Security (https://spring.io/projects/spring-security) ------------------------------------------------------------ - Version: 5.7.4 + Version: 5.7.5 From: 'Spring' (https://spring.io/) License(s): Apache v2.0 diff --git a/doc/licenses/spring-security-5.7.5/dep-coordinates.txt b/doc/licenses/spring-security-5.7.5/dep-coordinates.txt new file mode 100644 index 000000000..dbaf12fd3 --- /dev/null +++ b/doc/licenses/spring-security-5.7.5/dep-coordinates.txt @@ -0,0 +1,3 @@ +org.springframework.security:spring-security-core:jar:5.7.5 +org.springframework.security:spring-security-crypto:jar:5.7.5 +org.springframework.security:spring-security-web:jar:5.7.5 diff --git a/extensions/guacamole-auth-json/pom.xml b/extensions/guacamole-auth-json/pom.xml index ac4d63a22..ba98e25e9 100644 --- a/extensions/guacamole-auth-json/pom.xml +++ b/extensions/guacamole-auth-json/pom.xml @@ -77,7 +77,7 @@ org.springframework.security spring-security-web - 5.7.4 + 5.7.5 diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 2d2c0803d..e548d19c0 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -61,6 +61,12 @@ commons-lang3 + + + org.apache.commons + commons-text + + @@ -72,6 +78,14 @@ 3.12.0 + + + org.apache.commons + commons-text + 1.10.0 + + com.google.inject diff --git a/pom.xml b/pom.xml index ae413c07f..ed70e6f47 100644 --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ 31.1-jre 5.1.0 2.6.1 - 2.13.4 - 2.13.4.2 + 2.14.0 + 2.14.0 2.37 5.9.1 4.13.2