diff --git a/doc/licenses/apache-commons-1.16.0/NOTICE b/doc/licenses/apache-commons-1.16.0/NOTICE new file mode 100644 index 000000000..639cd1fb3 --- /dev/null +++ b/doc/licenses/apache-commons-1.16.0/NOTICE @@ -0,0 +1,5 @@ +Apache Commons Codec +Copyright 2002-2023 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-codec-1.15/README b/doc/licenses/apache-commons-1.16.0/README similarity index 92% rename from doc/licenses/apache-commons-codec-1.15/README rename to doc/licenses/apache-commons-1.16.0/README index eed5894c9..3a59af752 100644 --- a/doc/licenses/apache-commons-codec-1.15/README +++ b/doc/licenses/apache-commons-1.16.0/README @@ -1,7 +1,7 @@ Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) ----------------------------------------------------------------------- - Version: 1.15 + Version: 1.16.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt b/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt new file mode 100644 index 000000000..9d5153d43 --- /dev/null +++ b/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt @@ -0,0 +1 @@ +commons-codec:commons-codec:jar:1.16.0 diff --git a/doc/licenses/apache-commons-codec-1.15/NOTICE b/doc/licenses/apache-commons-codec-1.15/NOTICE deleted file mode 100644 index 9899d2108..000000000 --- a/doc/licenses/apache-commons-codec-1.15/NOTICE +++ /dev/null @@ -1,17 +0,0 @@ -Apache Commons Codec -Copyright 2002-2020 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (https://www.apache.org/). - -src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java -contains test data from http://aspell.net/test/orig/batch0.tab. -Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org) - -=============================================================================== - -The content of package org.apache.commons.codec.language.bm has been translated -from the original php source code available at http://stevemorse.org/phoneticinfo.htm -with permission from the original authors. -Original source copyright: -Copyright (c) 2008 Alexander Beider & Stephen P. Morse. diff --git a/doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt b/doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt deleted file mode 100644 index 29280ea81..000000000 --- a/doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -commons-codec:commons-codec:jar:1.15 diff --git a/doc/licenses/apache-commons-lang-3.12.0/dep-coordinates.txt b/doc/licenses/apache-commons-lang-3.12.0/dep-coordinates.txt deleted file mode 100644 index 512542ce6..000000000 --- a/doc/licenses/apache-commons-lang-3.12.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-lang3:jar:3.12.0 diff --git a/doc/licenses/apache-commons-lang-3.12.0/NOTICE b/doc/licenses/apache-commons-lang-3.14.0/NOTICE similarity index 70% rename from doc/licenses/apache-commons-lang-3.12.0/NOTICE rename to doc/licenses/apache-commons-lang-3.14.0/NOTICE index 3d4c6906a..307ec45cf 100644 --- a/doc/licenses/apache-commons-lang-3.12.0/NOTICE +++ b/doc/licenses/apache-commons-lang-3.14.0/NOTICE @@ -1,5 +1,5 @@ Apache Commons Lang -Copyright 2001-2021 The Apache Software Foundation +Copyright 2001-2023 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-lang-3.12.0/README b/doc/licenses/apache-commons-lang-3.14.0/README similarity index 92% rename from doc/licenses/apache-commons-lang-3.12.0/README rename to doc/licenses/apache-commons-lang-3.14.0/README index bce46d42b..079e21d57 100644 --- a/doc/licenses/apache-commons-lang-3.12.0/README +++ b/doc/licenses/apache-commons-lang-3.14.0/README @@ -1,7 +1,7 @@ Apache Commons Lang (http://commons.apache.org/proper/commons-lang/) -------------------------------------------------------------------- - Version: 3.12.0 + Version: 3.14.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt b/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt new file mode 100644 index 000000000..3822db1f7 --- /dev/null +++ b/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-lang3:jar:3.14.0 diff --git a/doc/licenses/apache-commons-pool-2.11.1/dep-coordinates.txt b/doc/licenses/apache-commons-pool-2.11.1/dep-coordinates.txt deleted file mode 100644 index c6fd9e945..000000000 --- a/doc/licenses/apache-commons-pool-2.11.1/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-pool2:jar:2.11.1 diff --git a/doc/licenses/apache-commons-pool-2.11.1/NOTICE b/doc/licenses/apache-commons-pool-2.12.0/NOTICE similarity index 70% rename from doc/licenses/apache-commons-pool-2.11.1/NOTICE rename to doc/licenses/apache-commons-pool-2.12.0/NOTICE index 75e95b7cc..2c90b4379 100644 --- a/doc/licenses/apache-commons-pool-2.11.1/NOTICE +++ b/doc/licenses/apache-commons-pool-2.12.0/NOTICE @@ -1,5 +1,5 @@ Apache Commons Pool -Copyright 2001-2021 The Apache Software Foundation +Copyright 2001-2023 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-pool-2.11.1/README b/doc/licenses/apache-commons-pool-2.12.0/README similarity index 92% rename from doc/licenses/apache-commons-pool-2.11.1/README rename to doc/licenses/apache-commons-pool-2.12.0/README index 730aa886c..18db98e00 100644 --- a/doc/licenses/apache-commons-pool-2.11.1/README +++ b/doc/licenses/apache-commons-pool-2.12.0/README @@ -1,7 +1,7 @@ Apache Commons Pool (http://commons.apache.org/proper/commons-pool/) -------------------------------------------------------------------- - Version: 2.11.1 + Version: 2.12.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt b/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt new file mode 100644 index 000000000..07edda244 --- /dev/null +++ b/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-pool2:jar:2.12.0 diff --git a/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt deleted file mode 100644 index 5bf57abcf..000000000 --- a/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.mina:mina-core:jar:2.2.2 diff --git a/doc/licenses/apache-mina-2.2.2/NOTICE b/doc/licenses/apache-mina-2.2.3/NOTICE similarity index 100% rename from doc/licenses/apache-mina-2.2.2/NOTICE rename to doc/licenses/apache-mina-2.2.3/NOTICE diff --git a/doc/licenses/apache-mina-2.2.2/README b/doc/licenses/apache-mina-2.2.3/README similarity index 90% rename from doc/licenses/apache-mina-2.2.2/README rename to doc/licenses/apache-mina-2.2.3/README index 8fea0f1e9..12b625967 100644 --- a/doc/licenses/apache-mina-2.2.2/README +++ b/doc/licenses/apache-mina-2.2.3/README @@ -1,7 +1,7 @@ Apache Mina (https://mina.apache.org/) -------------------------------------- - Version: 2.2.2 + Version: 2.2.3 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt new file mode 100644 index 000000000..c2d0321f7 --- /dev/null +++ b/doc/licenses/apache-mina-2.2.3/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.mina:mina-core:jar:2.2.3 diff --git a/doc/licenses/directory-api-2.1.4/dep-coordinates.txt b/doc/licenses/directory-api-2.1.4/dep-coordinates.txt deleted file mode 100644 index 8d7257210..000000000 --- a/doc/licenses/directory-api-2.1.4/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.directory.api:api-all:jar:2.1.4 diff --git a/doc/licenses/directory-api-2.1.4/NOTICE b/doc/licenses/directory-api-2.1.5/NOTICE similarity index 100% rename from doc/licenses/directory-api-2.1.4/NOTICE rename to doc/licenses/directory-api-2.1.5/NOTICE diff --git a/doc/licenses/directory-api-2.1.4/README b/doc/licenses/directory-api-2.1.5/README similarity index 91% rename from doc/licenses/directory-api-2.1.4/README rename to doc/licenses/directory-api-2.1.5/README index 1ceaa17b4..666bb5630 100644 --- a/doc/licenses/directory-api-2.1.4/README +++ b/doc/licenses/directory-api-2.1.5/README @@ -1,7 +1,7 @@ Apache Directory LDAP API (http://directory.apache.org) ------------------------------------------------------- - Version: 2.1.4 + Version: 2.1.5 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/directory-api-2.1.5/dep-coordinates.txt b/doc/licenses/directory-api-2.1.5/dep-coordinates.txt new file mode 100644 index 000000000..37dc92a9e --- /dev/null +++ b/doc/licenses/directory-api-2.1.5/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.directory.api:api-all:jar:2.1.5 diff --git a/doc/licenses/snakeyaml-2.0/dep-coordinates.txt b/doc/licenses/snakeyaml-2.0/dep-coordinates.txt deleted file mode 100644 index bdfaf14fe..000000000 --- a/doc/licenses/snakeyaml-2.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.yaml:snakeyaml:jar:2.0 diff --git a/doc/licenses/snakeyaml-2.0/README b/doc/licenses/snakeyaml-2.2/README similarity index 92% rename from doc/licenses/snakeyaml-2.0/README rename to doc/licenses/snakeyaml-2.2/README index 429eb9958..a1ce9461e 100644 --- a/doc/licenses/snakeyaml-2.0/README +++ b/doc/licenses/snakeyaml-2.2/README @@ -1,7 +1,7 @@ SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/ ----------------------------------------------------- - Version: 2.0 + Version: 2.2 From: 'Andrey Somov' (https://bitbucket.org/asomov/) License(s): Apache v2.0 diff --git a/doc/licenses/snakeyaml-2.2/dep-coordinates.txt b/doc/licenses/snakeyaml-2.2/dep-coordinates.txt new file mode 100644 index 000000000..94464ca33 --- /dev/null +++ b/doc/licenses/snakeyaml-2.2/dep-coordinates.txt @@ -0,0 +1 @@ +org.yaml:snakeyaml:jar:2.2 diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 1066608fe..2be994ea2 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -51,8 +51,19 @@ org.apache.directory.api api-all - 2.1.4 + 2.1.5 + + + + org.apache.commons + commons-lang3 + + @@ -72,6 +83,13 @@ jackson-dataformat-yaml + + + org.apache.commons + commons-lang3 + 3.14.0 + + 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 6acc7aa42..b6b25f767 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 @@ -65,6 +65,17 @@ org.glassfish.jaxb jaxb-core + + + + commons-codec + commons-codec + @@ -118,6 +129,13 @@ 2.3.1 + + + commons-codec + commons-codec + 1.16.0 + + diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml index 158632136..c9fa5d20c 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml @@ -94,21 +94,70 @@ xmlsec + + + org.apache.commons + commons-lang3 + + + + + commons-codec + commons-codec + + - + com.fasterxml.woodstox woodstox-core 5.4.0 - + org.apache.santuario xmlsec 2.2.6 + + + + + commons-codec + commons-codec + + + + + + + + org.apache.commons + commons-lang3 + 3.14.0 + + + + + commons-codec + commons-codec + 1.16.0