From 47215cfdf94b7cbe950f16fce33d4dd1d46d46f2 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 Apr 2021 15:43:29 -0700 Subject: [PATCH 01/11] GUACAMOLE-773: Update all Java dependencies to latest stable versions. --- doc/guacamole-example/pom.xml | 2 +- extensions/guacamole-auth-cas/pom.xml | 6 +----- extensions/guacamole-auth-duo/pom.xml | 4 ---- extensions/guacamole-auth-header/pom.xml | 4 ---- .../modules/guacamole-auth-jdbc-base/pom.xml | 8 ++------ extensions/guacamole-auth-json/pom.xml | 6 +----- extensions/guacamole-auth-ldap/pom.xml | 6 +----- extensions/guacamole-auth-openid/pom.xml | 6 +----- extensions/guacamole-auth-quickconnect/pom.xml | 4 ---- extensions/guacamole-auth-radius/pom.xml | 4 ---- extensions/guacamole-auth-saml/pom.xml | 6 +----- extensions/guacamole-auth-totp/pom.xml | 8 ++------ pom.xml | 15 +++++---------- 13 files changed, 15 insertions(+), 64 deletions(-) diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index 5140f8a1a..7474c9c9d 100644 --- a/doc/guacamole-example/pom.xml +++ b/doc/guacamole-example/pom.xml @@ -122,7 +122,7 @@ org.slf4j slf4j-simple - 1.7.7 + 1.7.30 diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml index 936a0c3a4..d5191fad3 100644 --- a/extensions/guacamole-auth-cas/pom.xml +++ b/extensions/guacamole-auth-cas/pom.xml @@ -51,7 +51,7 @@ org.jasig.cas.client cas-client-core - 3.4.1 + 3.6.2 org.slf4j @@ -71,10 +71,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml index 0acc0d89c..ccdc0f63d 100644 --- a/extensions/guacamole-auth-duo/pom.xml +++ b/extensions/guacamole-auth-duo/pom.xml @@ -147,10 +147,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml index eb284e8df..4c2bbcabd 100644 --- a/extensions/guacamole-auth-header/pom.xml +++ b/extensions/guacamole-auth-header/pom.xml @@ -52,10 +52,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml index 35bbcc25d..764311041 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml @@ -57,14 +57,14 @@ org.mybatis mybatis - 3.4.6 + 3.5.6 org.mybatis mybatis-guice - 3.10 + 3.12 @@ -72,10 +72,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-json/pom.xml b/extensions/guacamole-auth-json/pom.xml index c1e165ebc..0cbe414a2 100644 --- a/extensions/guacamole-auth-json/pom.xml +++ b/extensions/guacamole-auth-json/pom.xml @@ -52,10 +52,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - @@ -81,7 +77,7 @@ org.springframework.security spring-security-web - 5.4.1 + 5.4.5 diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 37ba09817..aa241ed14 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -51,7 +51,7 @@ org.apache.directory.api api-all - 2.0.0.AM4 + 2.0.1 org.slf4j @@ -65,10 +65,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml index f140a475f..2920ef204 100644 --- a/extensions/guacamole-auth-openid/pom.xml +++ b/extensions/guacamole-auth-openid/pom.xml @@ -102,7 +102,7 @@ org.bitbucket.b_c jose4j - 0.5.5 + 0.7.6 org.slf4j @@ -116,10 +116,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml index 59e6dad60..f9ad11529 100644 --- a/extensions/guacamole-auth-quickconnect/pom.xml +++ b/extensions/guacamole-auth-quickconnect/pom.xml @@ -107,10 +107,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml index 05fc4d82b..dbed7af44 100644 --- a/extensions/guacamole-auth-radius/pom.xml +++ b/extensions/guacamole-auth-radius/pom.xml @@ -130,10 +130,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - diff --git a/extensions/guacamole-auth-saml/pom.xml b/extensions/guacamole-auth-saml/pom.xml index 8fc102b01..d1ab3092e 100644 --- a/extensions/guacamole-auth-saml/pom.xml +++ b/extensions/guacamole-auth-saml/pom.xml @@ -52,10 +52,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - @@ -77,7 +73,7 @@ com.onelogin java-saml - 2.5.0 + 2.6.0 org.slf4j diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml index e9f01e2f7..d40e33002 100644 --- a/extensions/guacamole-auth-totp/pom.xml +++ b/extensions/guacamole-auth-totp/pom.xml @@ -142,10 +142,6 @@ com.google.inject guice - - com.google.inject.extensions - guice-multibindings - @@ -167,12 +163,12 @@ com.google.zxing javase - 3.3.1 + 3.4.1 com.google.zxing core - 3.3.1 + 3.4.1 diff --git a/pom.xml b/pom.xml index 632315f47..f50d333b0 100644 --- a/pom.xml +++ b/pom.xml @@ -36,12 +36,12 @@ UTF-8 - 30.1-jre - 4.2.3 + 30.1.1-jre + 5.0.1 2.6.1 - 2.10.1 - 2.31 - 5.6.0 + 2.12.2 + 2.33 + 5.7.1 1.2.3 1.7.30 @@ -267,11 +267,6 @@ guice-assistedinject ${guice.version} - - com.google.inject.extensions - guice-multibindings - ${guice.version} - com.google.inject.extensions guice-servlet From 17f76e670818fb2bc36ad38f7a1c8889bc017309 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 Apr 2021 20:37:59 -0700 Subject: [PATCH 02/11] GUACAMOLE-773: Automatically verify sanity of build. --- pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index f50d333b0..8548b8414 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,27 @@ + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M3 + + + enforce + + + + + + + + enforce + + + + + From aaa07115ba06a1e5995f40d1632ee827fad61829 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 Apr 2021 21:18:21 -0700 Subject: [PATCH 03/11] GUACAMOLE-773: Add exclusions as necessary to force correct dependency versions. Remove exclusions that are no longer necessary. --- extensions/guacamole-auth-cas/pom.xml | 6 ----- extensions/guacamole-auth-ldap/pom.xml | 6 ----- extensions/guacamole-auth-openid/pom.xml | 6 ----- extensions/guacamole-auth-radius/pom.xml | 18 ++++++++++----- extensions/guacamole-auth-saml/pom.xml | 15 +++++++++++-- guacamole/pom.xml | 28 +++++++++++++++--------- pom.xml | 10 +++++++++ 7 files changed, 53 insertions(+), 36 deletions(-) diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml index d5191fad3..a40c0fb31 100644 --- a/extensions/guacamole-auth-cas/pom.xml +++ b/extensions/guacamole-auth-cas/pom.xml @@ -52,12 +52,6 @@ org.jasig.cas.client cas-client-core 3.6.2 - - - org.slf4j - slf4j-api - - diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index aa241ed14..fa9d8a215 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -52,12 +52,6 @@ org.apache.directory.api api-all 2.0.1 - - - org.slf4j - slf4j-api - - diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml index 2920ef204..7c578dc1f 100644 --- a/extensions/guacamole-auth-openid/pom.xml +++ b/extensions/guacamole-auth-openid/pom.xml @@ -103,12 +103,6 @@ org.bitbucket.b_c jose4j 0.7.6 - - - org.slf4j - slf4j-api - - diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml index dbed7af44..f4bc18ec9 100644 --- a/extensions/guacamole-auth-radius/pom.xml +++ b/extensions/guacamole-auth-radius/pom.xml @@ -146,14 +146,15 @@ 1.1.5 - - org.slf4j - slf4j-api - + commons-logging commons-logging + + commons-collections + commons-collections + @@ -182,13 +183,18 @@ 1.1.5 - + commons-logging commons-logging 1.1.1 + + commons-collections + commons-collections + 3.2 + diff --git a/extensions/guacamole-auth-saml/pom.xml b/extensions/guacamole-auth-saml/pom.xml index d1ab3092e..ed550e448 100644 --- a/extensions/guacamole-auth-saml/pom.xml +++ b/extensions/guacamole-auth-saml/pom.xml @@ -75,13 +75,24 @@ java-saml 2.6.0 + + - org.slf4j - slf4j-api + commons-codec + commons-codec + + + + commons-codec + commons-codec + 1.15 + + diff --git a/guacamole/pom.xml b/guacamole/pom.xml index cb30ba899..ba108b1c1 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -436,23 +436,31 @@ jersey-media-json-jackson - + - jakarta.activation - jakarta.activation-api + com.fasterxml.jackson.core + jackson-core - - - jakarta.xml.bind - jakarta.xml.bind-api + com.fasterxml.jackson.module + jackson-module-jaxb-annotations - + + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + javax.annotation diff --git a/pom.xml b/pom.xml index 8548b8414..d67ef17be 100644 --- a/pom.xml +++ b/pom.xml @@ -331,11 +331,21 @@ jackson-annotations ${jackson.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + com.fasterxml.jackson.core jackson-databind ${jackson.version} + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + ${jackson.version} + From 481a2ca60b85c692558a2042609858741b40973f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 2 Apr 2021 21:18:52 -0700 Subject: [PATCH 04/11] GUACAMOLE-773: Switch to older mybatis-guice that uses a stable SLF4J. Newer releases of mybatis-guice have switched over to alpha releases of SLF4J 2.0.0. --- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml index 764311041..12f5f2636 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml @@ -64,7 +64,7 @@ org.mybatis mybatis-guice - 3.12 + 3.10 From d155975d932b1f4699631b1f530496c2a25faa5e Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 3 Apr 2021 17:21:34 -0700 Subject: [PATCH 05/11] GUACAMOLE-773: Allow license checks to be bypassed when necessary for testing/development. --- doc/licenses/generate-license-files.sh | 19 +++++++++++++++++-- pom.xml | 12 +++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/doc/licenses/generate-license-files.sh b/doc/licenses/generate-license-files.sh index 3148d12d7..6b575af1f 100755 --- a/doc/licenses/generate-license-files.sh +++ b/doc/licenses/generate-license-files.sh @@ -45,6 +45,15 @@ # OUTPUT_DIRECTORY is the directory in which the LICENSE and NOTICE files # should be written. # +# Ignoring license errors +# ----------------------- +# +# By default, this script will exit with a non-zero exit code if any license +# errors are encountered, failing the build. If this is undesirable (dependency +# changes are being tested, a full list of all license errors across all +# projects is needed, etc.), set the IGNORE_LICENSE_ERRORS environment variable +# to "true". +# # Structure of license information # -------------------------------- # @@ -359,6 +368,12 @@ for EXCLUDED_FILE in README maven-coordinates.txt; do rm -f "$OUTPUT_DIR/bundled"/*/"$EXCLUDED_FILE" done -# Fail if any errors occurred -[ "`cat "$HAS_ERRORS"`" != "1" ] && info "Dependency licenses processed successfully." +# Fail if any errors occured unless explicitly configured to ignore errors with +# the IGNORE_LICENSE_ERRORS environment variable +if [ "`cat "$HAS_ERRORS"`" = "1" ]; then + [ "$IGNORE_LICENSE_ERRORS" = "true" ] || exit 1 + info "Ignoring above license errors (IGNORE_LICENSE_ERRORS was set to \"$IGNORE_LICENSE_ERRORS\")." +else + info "Dependency licenses processed successfully." +fi diff --git a/pom.xml b/pom.xml index d67ef17be..c5b68294d 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,11 @@ 1.2.3 1.7.30 - - false + + false @@ -99,6 +102,7 @@ src/licenses/**/* target/**/* + ${ignoreLicenseErrors} @@ -202,7 +206,9 @@ ${project.build.directory}/runtime-dependencies.txt ${project.build.directory}/licenses - ${skipLicenseGeneration} + + ${ignoreLicenseErrors} + exec From a5ae5811c112b10a4b43881ee55a32820291b4a2 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 3 Apr 2021 18:59:42 -0700 Subject: [PATCH 06/11] GUACAMOLE-773: Bring license details of bundled Java dependencies up-to-date. --- .../maven-coordinates.txt | 1 - doc/licenses/apache-commons-codec-1.14/NOTICE | 18 ++++++++++++++ .../README | 2 +- .../maven-coordinates.txt | 1 + .../NOTICE | 4 ++-- doc/licenses/apache-commons-codec-1.15/README | 8 +++++++ .../maven-coordinates.txt | 1 + .../maven-coordinates.txt | 1 - .../NOTICE | 2 +- .../README | 2 +- .../maven-coordinates.txt | 1 + doc/licenses/apache-commons-lang-3.11/NOTICE | 5 ++++ .../README | 2 +- .../maven-coordinates.txt | 1 + doc/licenses/apache-commons-lang-3.4/NOTICE | 8 ------- .../maven-coordinates.txt | 1 - doc/licenses/apache-commons-pool-2.6.2/NOTICE | 12 ---------- .../maven-coordinates.txt | 1 - doc/licenses/apache-commons-pool-2.8.0/NOTICE | 5 ++++ .../README | 2 +- .../maven-coordinates.txt | 1 + .../maven-coordinates.txt | 1 - .../NOTICE | 2 +- .../README | 2 +- .../maven-coordinates.txt | 1 + doc/licenses/bouncycastle-1.66/LICENSE | 17 +++++++++++++ doc/licenses/bouncycastle-1.66/README | 8 +++++++ .../bouncycastle-1.66/maven-coordinates.txt | 2 ++ .../cas-client-3.4.1/maven-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../cas-client-3.6.2/maven-coordinates.txt | 1 + .../checker-qual-3.5.0/maven-coordinates.txt | 1 - .../LICENSE.txt | 0 .../README | 4 ++-- .../checker-qual-3.8.0/maven-coordinates.txt | 1 + doc/licenses/directory-api-2.0.0/NOTICE | 24 ------------------- .../directory-api-2.0.0/maven-coordinates.txt | 1 - doc/licenses/directory-api-2.0.1/NOTICE | 5 ++++ .../README | 2 +- .../directory-api-2.0.1/maven-coordinates.txt | 1 + .../error-prone-2.3.4/maven-coordinates.txt | 1 - .../README | 2 +- .../error-prone-2.5.1/maven-coordinates.txt | 1 + .../README | 2 +- .../maven-coordinates.txt | 2 +- .../guice-4.2.3/maven-coordinates.txt | 4 ---- .../{guice-4.2.3 => guice-5.0.1}/README | 2 +- .../guice-5.0.1/maven-coordinates.txt | 3 +++ .../jackson-2.10.1/maven-coordinates.txt | 4 ---- .../{jackson-2.10.1 => jackson-2.12.2}/NOTICE | 3 +-- .../{jackson-2.10.1 => jackson-2.12.2}/README | 2 +- .../jackson-2.12.2/maven-coordinates.txt | 4 ++++ .../maven-coordinates.txt | 1 - .../LICENSE.txt | 0 .../README | 4 ++-- .../maven-coordinates.txt | 1 + .../java-saml-2.5.0/maven-coordinates.txt | 2 -- .../LICENSE | 0 .../README | 4 ++-- .../java-saml-2.6.0/maven-coordinates.txt | 2 ++ .../jcommander-1.72/maven-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../jcommander-1.78/maven-coordinates.txt | 1 + .../jersey-2.31/maven-coordinates.txt | 8 ------- .../{jersey-2.31 => jersey-2.33}/LICENSE.md | 0 .../{jersey-2.31 => jersey-2.33}/README | 4 ++-- .../jersey-2.33/maven-coordinates.txt | 7 ++++++ .../joda-time-2.10.3/maven-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../joda-time-2.10.6/maven-coordinates.txt | 1 + .../jose4j-0.5.5/maven-coordinates.txt | 1 - .../{jose4j-0.5.5 => jose4j-0.7.6}/NOTICE | 0 .../{jose4j-0.5.5 => jose4j-0.7.6}/README | 2 +- .../jose4j-0.7.6/maven-coordinates.txt | 1 + .../mybatis-3.2.8/maven-coordinates.txt | 1 - .../{mybatis-3.2.8 => mybatis-3.5.6}/NOTICE | 0 .../{mybatis-3.2.8 => mybatis-3.5.6}/README | 2 +- .../mybatis-3.5.6/maven-coordinates.txt | 1 + .../NOTICE | 0 .../README | 2 +- .../maven-coordinates.txt | 0 .../README | 2 +- .../maven-coordinates.txt | 7 ++++++ .../maven-coordinates.txt | 7 ------ .../maven-coordinates.txt | 2 -- .../NOTICE | 0 .../README | 2 +- .../maven-coordinates.txt | 2 ++ .../woodstox-core-5.0.3/maven-coordinates.txt | 1 - .../README | 2 +- .../woodstox-core-5.2.1/maven-coordinates.txt | 1 + .../maven-coordinates.txt | 1 - .../LICENSE | 4 ++-- .../README | 4 ++-- .../maven-coordinates.txt | 1 + .../zxing-3.3.1/maven-coordinates.txt | 2 -- .../{zxing-3.3.1 => zxing-3.4.1}/NOTICE | 0 .../{zxing-3.3.1 => zxing-3.4.1}/README | 4 ++-- .../zxing-3.4.1/maven-coordinates.txt | 2 ++ 102 files changed, 151 insertions(+), 129 deletions(-) delete mode 100644 doc/licenses/apache-commons-codec-1.12/maven-coordinates.txt create mode 100644 doc/licenses/apache-commons-codec-1.14/NOTICE rename doc/licenses/{apache-commons-codec-1.12 => apache-commons-codec-1.14}/README (93%) create mode 100644 doc/licenses/apache-commons-codec-1.14/maven-coordinates.txt rename doc/licenses/{apache-commons-codec-1.12 => apache-commons-codec-1.15}/NOTICE (85%) create mode 100644 doc/licenses/apache-commons-codec-1.15/README create mode 100644 doc/licenses/apache-commons-codec-1.15/maven-coordinates.txt delete mode 100644 doc/licenses/apache-commons-collections-4.3/maven-coordinates.txt rename doc/licenses/{apache-commons-collections-4.3 => apache-commons-collections-4.4}/NOTICE (71%) rename doc/licenses/{apache-commons-collections-4.3 => apache-commons-collections-4.4}/README (93%) create mode 100644 doc/licenses/apache-commons-collections-4.4/maven-coordinates.txt create mode 100644 doc/licenses/apache-commons-lang-3.11/NOTICE rename doc/licenses/{apache-commons-lang-3.4 => apache-commons-lang-3.11}/README (92%) create mode 100644 doc/licenses/apache-commons-lang-3.11/maven-coordinates.txt delete mode 100644 doc/licenses/apache-commons-lang-3.4/NOTICE delete mode 100644 doc/licenses/apache-commons-lang-3.4/maven-coordinates.txt delete mode 100644 doc/licenses/apache-commons-pool-2.6.2/NOTICE delete mode 100644 doc/licenses/apache-commons-pool-2.6.2/maven-coordinates.txt create mode 100644 doc/licenses/apache-commons-pool-2.8.0/NOTICE rename doc/licenses/{apache-commons-pool-2.6.2 => apache-commons-pool-2.8.0}/README (92%) create mode 100644 doc/licenses/apache-commons-pool-2.8.0/maven-coordinates.txt delete mode 100644 doc/licenses/apache-santuario-2.1.4/maven-coordinates.txt rename doc/licenses/{apache-santuario-2.1.4 => apache-santuario-2.2.0}/NOTICE (88%) rename doc/licenses/{apache-santuario-2.1.4 => apache-santuario-2.2.0}/README (91%) create mode 100644 doc/licenses/apache-santuario-2.2.0/maven-coordinates.txt create mode 100644 doc/licenses/bouncycastle-1.66/LICENSE create mode 100644 doc/licenses/bouncycastle-1.66/README create mode 100644 doc/licenses/bouncycastle-1.66/maven-coordinates.txt delete mode 100644 doc/licenses/cas-client-3.4.1/maven-coordinates.txt rename doc/licenses/{cas-client-3.4.1 => cas-client-3.6.2}/NOTICE (100%) rename doc/licenses/{cas-client-3.4.1 => cas-client-3.6.2}/README (91%) create mode 100644 doc/licenses/cas-client-3.6.2/maven-coordinates.txt delete mode 100644 doc/licenses/checker-qual-3.5.0/maven-coordinates.txt rename doc/licenses/{checker-qual-3.5.0 => checker-qual-3.8.0}/LICENSE.txt (100%) rename doc/licenses/{checker-qual-3.5.0 => checker-qual-3.8.0}/README (74%) create mode 100644 doc/licenses/checker-qual-3.8.0/maven-coordinates.txt delete mode 100644 doc/licenses/directory-api-2.0.0/NOTICE delete mode 100644 doc/licenses/directory-api-2.0.0/maven-coordinates.txt create mode 100644 doc/licenses/directory-api-2.0.1/NOTICE rename doc/licenses/{directory-api-2.0.0 => directory-api-2.0.1}/README (90%) create mode 100644 doc/licenses/directory-api-2.0.1/maven-coordinates.txt delete mode 100644 doc/licenses/error-prone-2.3.4/maven-coordinates.txt rename doc/licenses/{error-prone-2.3.4 => error-prone-2.5.1}/README (89%) create mode 100644 doc/licenses/error-prone-2.5.1/maven-coordinates.txt rename doc/licenses/{guava-30.1-jre => guava-30.1.1-jre}/README (90%) rename doc/licenses/{guava-30.1-jre => guava-30.1.1-jre}/maven-coordinates.txt (76%) delete mode 100644 doc/licenses/guice-4.2.3/maven-coordinates.txt rename doc/licenses/{guice-4.2.3 => guice-5.0.1}/README (90%) create mode 100644 doc/licenses/guice-5.0.1/maven-coordinates.txt delete mode 100644 doc/licenses/jackson-2.10.1/maven-coordinates.txt rename doc/licenses/{jackson-2.10.1 => jackson-2.12.2}/NOTICE (62%) rename doc/licenses/{jackson-2.10.1 => jackson-2.12.2}/README (90%) create mode 100644 doc/licenses/jackson-2.12.2/maven-coordinates.txt delete mode 100644 doc/licenses/jai-imageio-core-1.3.1/maven-coordinates.txt rename doc/licenses/{jai-imageio-core-1.3.1 => jai-imageio-core-1.4.0}/LICENSE.txt (100%) rename doc/licenses/{jai-imageio-core-1.3.1 => jai-imageio-core-1.4.0}/README (82%) create mode 100644 doc/licenses/jai-imageio-core-1.4.0/maven-coordinates.txt delete mode 100644 doc/licenses/java-saml-2.5.0/maven-coordinates.txt rename doc/licenses/{java-saml-2.5.0 => java-saml-2.6.0}/LICENSE (100%) rename doc/licenses/{java-saml-2.5.0 => java-saml-2.6.0}/README (73%) create mode 100644 doc/licenses/java-saml-2.6.0/maven-coordinates.txt delete mode 100644 doc/licenses/jcommander-1.72/maven-coordinates.txt rename doc/licenses/{jcommander-1.72 => jcommander-1.78}/NOTICE (100%) rename doc/licenses/{jcommander-1.72 => jcommander-1.78}/README (90%) create mode 100644 doc/licenses/jcommander-1.78/maven-coordinates.txt delete mode 100644 doc/licenses/jersey-2.31/maven-coordinates.txt rename doc/licenses/{jersey-2.31 => jersey-2.33}/LICENSE.md (100%) rename doc/licenses/{jersey-2.31 => jersey-2.33}/README (67%) create mode 100644 doc/licenses/jersey-2.33/maven-coordinates.txt delete mode 100644 doc/licenses/joda-time-2.10.3/maven-coordinates.txt rename doc/licenses/{joda-time-2.10.3 => joda-time-2.10.6}/NOTICE (100%) rename doc/licenses/{joda-time-2.10.3 => joda-time-2.10.6}/README (89%) create mode 100644 doc/licenses/joda-time-2.10.6/maven-coordinates.txt delete mode 100644 doc/licenses/jose4j-0.5.5/maven-coordinates.txt rename doc/licenses/{jose4j-0.5.5 => jose4j-0.7.6}/NOTICE (100%) rename doc/licenses/{jose4j-0.5.5 => jose4j-0.7.6}/README (90%) create mode 100644 doc/licenses/jose4j-0.7.6/maven-coordinates.txt delete mode 100644 doc/licenses/mybatis-3.2.8/maven-coordinates.txt rename doc/licenses/{mybatis-3.2.8 => mybatis-3.5.6}/NOTICE (100%) rename doc/licenses/{mybatis-3.2.8 => mybatis-3.5.6}/README (90%) create mode 100644 doc/licenses/mybatis-3.5.6/maven-coordinates.txt rename doc/licenses/{mybatis-guice-3.6 => mybatis-guice-3.10}/NOTICE (100%) rename doc/licenses/{mybatis-guice-3.6 => mybatis-guice-3.10}/README (90%) rename doc/licenses/{mybatis-guice-3.6 => mybatis-guice-3.10}/maven-coordinates.txt (100%) rename doc/licenses/{spring-framework-5.2.9 => spring-framework-5.2.13}/README (91%) create mode 100644 doc/licenses/spring-framework-5.2.13/maven-coordinates.txt delete mode 100644 doc/licenses/spring-framework-5.2.9/maven-coordinates.txt delete mode 100644 doc/licenses/spring-security-5.4.1/maven-coordinates.txt rename doc/licenses/{spring-security-5.4.1 => spring-security-5.4.5}/NOTICE (100%) rename doc/licenses/{spring-security-5.4.1 => spring-security-5.4.5}/README (91%) create mode 100644 doc/licenses/spring-security-5.4.5/maven-coordinates.txt delete mode 100644 doc/licenses/woodstox-core-5.0.3/maven-coordinates.txt rename doc/licenses/{woodstox-core-5.0.3 => woodstox-core-5.2.1}/README (91%) create mode 100644 doc/licenses/woodstox-core-5.2.1/maven-coordinates.txt delete mode 100644 doc/licenses/woodstox-stax2-api-3.1.4/maven-coordinates.txt rename doc/licenses/{woodstox-stax2-api-3.1.4 => woodstox-stax2-api-4.2}/LICENSE (92%) rename doc/licenses/{woodstox-stax2-api-3.1.4 => woodstox-stax2-api-4.2}/README (69%) create mode 100644 doc/licenses/woodstox-stax2-api-4.2/maven-coordinates.txt delete mode 100644 doc/licenses/zxing-3.3.1/maven-coordinates.txt rename doc/licenses/{zxing-3.3.1 => zxing-3.4.1}/NOTICE (100%) rename doc/licenses/{zxing-3.3.1 => zxing-3.4.1}/README (85%) create mode 100644 doc/licenses/zxing-3.4.1/maven-coordinates.txt diff --git a/doc/licenses/apache-commons-codec-1.12/maven-coordinates.txt b/doc/licenses/apache-commons-codec-1.12/maven-coordinates.txt deleted file mode 100644 index 5889f3b6d..000000000 --- a/doc/licenses/apache-commons-codec-1.12/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -commons-codec:commons-codec:jar:1.12 diff --git a/doc/licenses/apache-commons-codec-1.14/NOTICE b/doc/licenses/apache-commons-codec-1.14/NOTICE new file mode 100644 index 000000000..40fb0f39f --- /dev/null +++ b/doc/licenses/apache-commons-codec-1.14/NOTICE @@ -0,0 +1,18 @@ + +Apache Commons Codec +Copyright 2002-2019 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.12/README b/doc/licenses/apache-commons-codec-1.14/README similarity index 93% rename from doc/licenses/apache-commons-codec-1.12/README rename to doc/licenses/apache-commons-codec-1.14/README index 1913a69ad..cbdc2b861 100644 --- a/doc/licenses/apache-commons-codec-1.12/README +++ b/doc/licenses/apache-commons-codec-1.14/README @@ -1,7 +1,7 @@ Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) ----------------------------------------------------------------------- - Version: 1.12 + Version: 1.14 From: 'Apache Software Foundation' (http://www.apache.org) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-codec-1.14/maven-coordinates.txt b/doc/licenses/apache-commons-codec-1.14/maven-coordinates.txt new file mode 100644 index 000000000..80e6bb745 --- /dev/null +++ b/doc/licenses/apache-commons-codec-1.14/maven-coordinates.txt @@ -0,0 +1 @@ +commons-codec:commons-codec:jar:1.14 diff --git a/doc/licenses/apache-commons-codec-1.12/NOTICE b/doc/licenses/apache-commons-codec-1.15/NOTICE similarity index 85% rename from doc/licenses/apache-commons-codec-1.12/NOTICE rename to doc/licenses/apache-commons-codec-1.15/NOTICE index 950f3dbe8..9899d2108 100644 --- a/doc/licenses/apache-commons-codec-1.12/NOTICE +++ b/doc/licenses/apache-commons-codec-1.15/NOTICE @@ -1,8 +1,8 @@ Apache Commons Codec -Copyright 2002-2017 The Apache Software Foundation +Copyright 2002-2020 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +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. diff --git a/doc/licenses/apache-commons-codec-1.15/README b/doc/licenses/apache-commons-codec-1.15/README new file mode 100644 index 000000000..95038e00a --- /dev/null +++ b/doc/licenses/apache-commons-codec-1.15/README @@ -0,0 +1,8 @@ +Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) +----------------------------------------------------------------------- + + Version: 1.15 + From: 'Apache Software Foundation' (http://www.apache.org) + License(s): + Apache v2.0 + diff --git a/doc/licenses/apache-commons-codec-1.15/maven-coordinates.txt b/doc/licenses/apache-commons-codec-1.15/maven-coordinates.txt new file mode 100644 index 000000000..29280ea81 --- /dev/null +++ b/doc/licenses/apache-commons-codec-1.15/maven-coordinates.txt @@ -0,0 +1 @@ +commons-codec:commons-codec:jar:1.15 diff --git a/doc/licenses/apache-commons-collections-4.3/maven-coordinates.txt b/doc/licenses/apache-commons-collections-4.3/maven-coordinates.txt deleted file mode 100644 index a73af9485..000000000 --- a/doc/licenses/apache-commons-collections-4.3/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-collections4:jar:4.3 diff --git a/doc/licenses/apache-commons-collections-4.3/NOTICE b/doc/licenses/apache-commons-collections-4.4/NOTICE similarity index 71% rename from doc/licenses/apache-commons-collections-4.3/NOTICE rename to doc/licenses/apache-commons-collections-4.4/NOTICE index 47040d7ef..8b11c65ae 100644 --- a/doc/licenses/apache-commons-collections-4.3/NOTICE +++ b/doc/licenses/apache-commons-collections-4.4/NOTICE @@ -1,5 +1,5 @@ Apache Commons Collections -Copyright 2001-2018 The Apache Software Foundation +Copyright 2001-2019 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/doc/licenses/apache-commons-collections-4.3/README b/doc/licenses/apache-commons-collections-4.4/README similarity index 93% rename from doc/licenses/apache-commons-collections-4.3/README rename to doc/licenses/apache-commons-collections-4.4/README index 6af0ff799..972b6167b 100644 --- a/doc/licenses/apache-commons-collections-4.3/README +++ b/doc/licenses/apache-commons-collections-4.4/README @@ -2,7 +2,7 @@ Apache Commons Collections (http://commons.apache.org/proper/commons-collections/) ------------------------------------------------------- - Version: 4.3 + Version: 4.4 From: 'Apache Software Foundation' (http://www.apache.org) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-collections-4.4/maven-coordinates.txt b/doc/licenses/apache-commons-collections-4.4/maven-coordinates.txt new file mode 100644 index 000000000..4e26938a5 --- /dev/null +++ b/doc/licenses/apache-commons-collections-4.4/maven-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-collections4:jar:4.4 diff --git a/doc/licenses/apache-commons-lang-3.11/NOTICE b/doc/licenses/apache-commons-lang-3.11/NOTICE new file mode 100644 index 000000000..72eb0990a --- /dev/null +++ b/doc/licenses/apache-commons-lang-3.11/NOTICE @@ -0,0 +1,5 @@ +Apache Commons Lang +Copyright 2001-2020 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.4/README b/doc/licenses/apache-commons-lang-3.11/README similarity index 92% rename from doc/licenses/apache-commons-lang-3.4/README rename to doc/licenses/apache-commons-lang-3.11/README index 5009e8125..07c1d93fd 100644 --- a/doc/licenses/apache-commons-lang-3.4/README +++ b/doc/licenses/apache-commons-lang-3.11/README @@ -1,7 +1,7 @@ Apache Commons Lang (http://commons.apache.org/proper/commons-lang/) -------------------------------------------------------------------- - Version: 3.4 + Version: 3.11 From: 'Apache Software Foundation' (http://www.apache.org) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-lang-3.11/maven-coordinates.txt b/doc/licenses/apache-commons-lang-3.11/maven-coordinates.txt new file mode 100644 index 000000000..df87ddb71 --- /dev/null +++ b/doc/licenses/apache-commons-lang-3.11/maven-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-lang3:jar:3.11 diff --git a/doc/licenses/apache-commons-lang-3.4/NOTICE b/doc/licenses/apache-commons-lang-3.4/NOTICE deleted file mode 100644 index 592023af7..000000000 --- a/doc/licenses/apache-commons-lang-3.4/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ -Apache Commons Lang -Copyright 2001-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This product includes software from the Spring Framework, -under the Apache License 2.0 (see: StringUtils.containsWhitespace()) diff --git a/doc/licenses/apache-commons-lang-3.4/maven-coordinates.txt b/doc/licenses/apache-commons-lang-3.4/maven-coordinates.txt deleted file mode 100644 index f0ed7295d..000000000 --- a/doc/licenses/apache-commons-lang-3.4/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-lang3:jar:3.4 diff --git a/doc/licenses/apache-commons-pool-2.6.2/NOTICE b/doc/licenses/apache-commons-pool-2.6.2/NOTICE deleted file mode 100644 index e0ef271c0..000000000 --- a/doc/licenses/apache-commons-pool-2.6.2/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ -Apache Commons Pool -Copyright 2001-2019 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - APACHE COMMONS POOL DERIVATIVE WORKS: - - The LinkedBlockingDeque implementation is based on an implementation written by - Doug Lea with assistance from members of JCP JSR-166 Expert Group and released - to the public domain, as explained at - http://creativecommons.org/licenses/publicdomain diff --git a/doc/licenses/apache-commons-pool-2.6.2/maven-coordinates.txt b/doc/licenses/apache-commons-pool-2.6.2/maven-coordinates.txt deleted file mode 100644 index 3a3ea9b19..000000000 --- a/doc/licenses/apache-commons-pool-2.6.2/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.commons:commons-pool2:jar:2.6.2 diff --git a/doc/licenses/apache-commons-pool-2.8.0/NOTICE b/doc/licenses/apache-commons-pool-2.8.0/NOTICE new file mode 100644 index 000000000..dca4979bc --- /dev/null +++ b/doc/licenses/apache-commons-pool-2.8.0/NOTICE @@ -0,0 +1,5 @@ +Apache Commons Pool +Copyright 2001-2019 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.6.2/README b/doc/licenses/apache-commons-pool-2.8.0/README similarity index 92% rename from doc/licenses/apache-commons-pool-2.6.2/README rename to doc/licenses/apache-commons-pool-2.8.0/README index 1858d28f4..9d3020ee0 100644 --- a/doc/licenses/apache-commons-pool-2.6.2/README +++ b/doc/licenses/apache-commons-pool-2.8.0/README @@ -1,7 +1,7 @@ Apache Commons Pool (http://commons.apache.org/proper/commons-pool/) -------------------------------------------------------------------- - Version: 2.6.2 + Version: 2.8.0 From: 'Apache Software Foundation' (http://www.apache.org) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-pool-2.8.0/maven-coordinates.txt b/doc/licenses/apache-commons-pool-2.8.0/maven-coordinates.txt new file mode 100644 index 000000000..f42ccc3f8 --- /dev/null +++ b/doc/licenses/apache-commons-pool-2.8.0/maven-coordinates.txt @@ -0,0 +1 @@ +org.apache.commons:commons-pool2:jar:2.8.0 diff --git a/doc/licenses/apache-santuario-2.1.4/maven-coordinates.txt b/doc/licenses/apache-santuario-2.1.4/maven-coordinates.txt deleted file mode 100644 index 6ef7a4462..000000000 --- a/doc/licenses/apache-santuario-2.1.4/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.santuario:xmlsec:jar:2.1.4 diff --git a/doc/licenses/apache-santuario-2.1.4/NOTICE b/doc/licenses/apache-santuario-2.2.0/NOTICE similarity index 88% rename from doc/licenses/apache-santuario-2.1.4/NOTICE rename to doc/licenses/apache-santuario-2.2.0/NOTICE index 16d91b26b..9ea0e11cb 100644 --- a/doc/licenses/apache-santuario-2.1.4/NOTICE +++ b/doc/licenses/apache-santuario-2.2.0/NOTICE @@ -1,5 +1,5 @@ Apache Santuario - XML Security for Java -Copyright 1999-2019 The Apache Software Foundation +Copyright 1999-2020 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/doc/licenses/apache-santuario-2.1.4/README b/doc/licenses/apache-santuario-2.2.0/README similarity index 91% rename from doc/licenses/apache-santuario-2.1.4/README rename to doc/licenses/apache-santuario-2.2.0/README index c1d0a9286..104934784 100644 --- a/doc/licenses/apache-santuario-2.1.4/README +++ b/doc/licenses/apache-santuario-2.2.0/README @@ -1,7 +1,7 @@ Apache Santuario (https://santuario.apache.org/) ------------------------------------------------- - Version: 2.1.4 + Version: 2.2.0 From: 'Apache Software Foundation' (http://www.apache.org) License(s): Apache v2.0 diff --git a/doc/licenses/apache-santuario-2.2.0/maven-coordinates.txt b/doc/licenses/apache-santuario-2.2.0/maven-coordinates.txt new file mode 100644 index 000000000..8aa793077 --- /dev/null +++ b/doc/licenses/apache-santuario-2.2.0/maven-coordinates.txt @@ -0,0 +1 @@ +org.apache.santuario:xmlsec:jar:2.2.0 diff --git a/doc/licenses/bouncycastle-1.66/LICENSE b/doc/licenses/bouncycastle-1.66/LICENSE new file mode 100644 index 000000000..cbd3989e2 --- /dev/null +++ b/doc/licenses/bouncycastle-1.66/LICENSE @@ -0,0 +1,17 @@ +Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software +and associated documentation files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/doc/licenses/bouncycastle-1.66/README b/doc/licenses/bouncycastle-1.66/README new file mode 100644 index 000000000..47e6c75cc --- /dev/null +++ b/doc/licenses/bouncycastle-1.66/README @@ -0,0 +1,8 @@ +BouncyCastle Crypto (https://www.bouncycastle.org/java.html) +------------------------------------------------------------ + + Version: 1.66 + From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) + License(s): + MIT (bundled/bouncycastle-1.66/LICENSE + diff --git a/doc/licenses/bouncycastle-1.66/maven-coordinates.txt b/doc/licenses/bouncycastle-1.66/maven-coordinates.txt new file mode 100644 index 000000000..42a0f2d36 --- /dev/null +++ b/doc/licenses/bouncycastle-1.66/maven-coordinates.txt @@ -0,0 +1,2 @@ +org.bouncycastle:bcpkix-jdk15on:jar:1.66 +org.bouncycastle:bcprov-jdk15on:jar:1.66 diff --git a/doc/licenses/cas-client-3.4.1/maven-coordinates.txt b/doc/licenses/cas-client-3.4.1/maven-coordinates.txt deleted file mode 100644 index a39afe741..000000000 --- a/doc/licenses/cas-client-3.4.1/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.jasig.cas.client:cas-client-core:jar:3.4.1 diff --git a/doc/licenses/cas-client-3.4.1/NOTICE b/doc/licenses/cas-client-3.6.2/NOTICE similarity index 100% rename from doc/licenses/cas-client-3.4.1/NOTICE rename to doc/licenses/cas-client-3.6.2/NOTICE diff --git a/doc/licenses/cas-client-3.4.1/README b/doc/licenses/cas-client-3.6.2/README similarity index 91% rename from doc/licenses/cas-client-3.4.1/README rename to doc/licenses/cas-client-3.6.2/README index d6514faa6..d9753d2fb 100644 --- a/doc/licenses/cas-client-3.4.1/README +++ b/doc/licenses/cas-client-3.6.2/README @@ -1,7 +1,7 @@ Java Apereo CAS Client (https://www.apereo.org/projects/cas) ------------------------------------------------------------ - Version: 3.4.1 + Version: 3.6.2 From: 'Apereo Foundation' (https://www.apereo.org/) License(s): Apache v2.0 diff --git a/doc/licenses/cas-client-3.6.2/maven-coordinates.txt b/doc/licenses/cas-client-3.6.2/maven-coordinates.txt new file mode 100644 index 000000000..d8fdc4e2c --- /dev/null +++ b/doc/licenses/cas-client-3.6.2/maven-coordinates.txt @@ -0,0 +1 @@ +org.jasig.cas.client:cas-client-core:jar:3.6.2 diff --git a/doc/licenses/checker-qual-3.5.0/maven-coordinates.txt b/doc/licenses/checker-qual-3.5.0/maven-coordinates.txt deleted file mode 100644 index 4ced44b0f..000000000 --- a/doc/licenses/checker-qual-3.5.0/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.checkerframework:checker-qual:jar:3.5.0 diff --git a/doc/licenses/checker-qual-3.5.0/LICENSE.txt b/doc/licenses/checker-qual-3.8.0/LICENSE.txt similarity index 100% rename from doc/licenses/checker-qual-3.5.0/LICENSE.txt rename to doc/licenses/checker-qual-3.8.0/LICENSE.txt diff --git a/doc/licenses/checker-qual-3.5.0/README b/doc/licenses/checker-qual-3.8.0/README similarity index 74% rename from doc/licenses/checker-qual-3.5.0/README rename to doc/licenses/checker-qual-3.8.0/README index 02e43e2b9..80ecceaf3 100644 --- a/doc/licenses/checker-qual-3.5.0/README +++ b/doc/licenses/checker-qual-3.8.0/README @@ -1,8 +1,8 @@ Checker Framework qualifiers (https://checkerframework.org/) ------------------------------------------------------------ - Version: 3.5.0 + Version: 3.8.0 From: 'Checker Framework developers' (https://checkerframework.org/) License(s): - MIT (bundled/checker-qual-3.5.0/LICENSE.txt) + MIT (bundled/checker-qual-3.8.0/LICENSE.txt) diff --git a/doc/licenses/checker-qual-3.8.0/maven-coordinates.txt b/doc/licenses/checker-qual-3.8.0/maven-coordinates.txt new file mode 100644 index 000000000..9a72d08f5 --- /dev/null +++ b/doc/licenses/checker-qual-3.8.0/maven-coordinates.txt @@ -0,0 +1 @@ +org.checkerframework:checker-qual:jar:3.8.0 diff --git a/doc/licenses/directory-api-2.0.0/NOTICE b/doc/licenses/directory-api-2.0.0/NOTICE deleted file mode 100644 index d4f56e376..000000000 --- a/doc/licenses/directory-api-2.0.0/NOTICE +++ /dev/null @@ -1,24 +0,0 @@ -Apache Directory LDAP API -Copyright 2003-2019 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -This product includes/uses jBCrypt which is subject to the following license: - -/* - * Copyright (c) 2006 Damien Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - diff --git a/doc/licenses/directory-api-2.0.0/maven-coordinates.txt b/doc/licenses/directory-api-2.0.0/maven-coordinates.txt deleted file mode 100644 index 5980e88eb..000000000 --- a/doc/licenses/directory-api-2.0.0/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.directory.api:api-all:jar:2.0.0.AM4 diff --git a/doc/licenses/directory-api-2.0.1/NOTICE b/doc/licenses/directory-api-2.0.1/NOTICE new file mode 100644 index 000000000..34f155ef7 --- /dev/null +++ b/doc/licenses/directory-api-2.0.1/NOTICE @@ -0,0 +1,5 @@ +Apache Directory LDAP API +Copyright 2003-2019 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/doc/licenses/directory-api-2.0.0/README b/doc/licenses/directory-api-2.0.1/README similarity index 90% rename from doc/licenses/directory-api-2.0.0/README rename to doc/licenses/directory-api-2.0.1/README index 754869c6c..200bb050d 100644 --- a/doc/licenses/directory-api-2.0.0/README +++ b/doc/licenses/directory-api-2.0.1/README @@ -1,7 +1,7 @@ Apache Directory LDAP API (http://directory.apache.org) ------------------------------------------------------- - Version: 2.0.0.AM4 + Version: 2.0.1 From: 'Apache Software Foundation' (http://apache.org) License(s): Apache v2.0 diff --git a/doc/licenses/directory-api-2.0.1/maven-coordinates.txt b/doc/licenses/directory-api-2.0.1/maven-coordinates.txt new file mode 100644 index 000000000..5400d258a --- /dev/null +++ b/doc/licenses/directory-api-2.0.1/maven-coordinates.txt @@ -0,0 +1 @@ +org.apache.directory.api:api-all:jar:2.0.1 diff --git a/doc/licenses/error-prone-2.3.4/maven-coordinates.txt b/doc/licenses/error-prone-2.3.4/maven-coordinates.txt deleted file mode 100644 index a51846f91..000000000 --- a/doc/licenses/error-prone-2.3.4/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.google.errorprone:error_prone_annotations:jar:2.3.4 diff --git a/doc/licenses/error-prone-2.3.4/README b/doc/licenses/error-prone-2.5.1/README similarity index 89% rename from doc/licenses/error-prone-2.3.4/README rename to doc/licenses/error-prone-2.5.1/README index 119057567..fc049dade 100644 --- a/doc/licenses/error-prone-2.3.4/README +++ b/doc/licenses/error-prone-2.5.1/README @@ -1,7 +1,7 @@ Error Prone (https://errorprone.info/) -------------------------------------- - Version: 2.3.4 + Version: 2.5.1 From: 'Google Inc.' (http://www.google.com/) License(s): Apache v2.0 diff --git a/doc/licenses/error-prone-2.5.1/maven-coordinates.txt b/doc/licenses/error-prone-2.5.1/maven-coordinates.txt new file mode 100644 index 000000000..5e8621975 --- /dev/null +++ b/doc/licenses/error-prone-2.5.1/maven-coordinates.txt @@ -0,0 +1 @@ +com.google.errorprone:error_prone_annotations:jar:2.5.1 diff --git a/doc/licenses/guava-30.1-jre/README b/doc/licenses/guava-30.1.1-jre/README similarity index 90% rename from doc/licenses/guava-30.1-jre/README rename to doc/licenses/guava-30.1.1-jre/README index 52aff5653..4f54e0534 100644 --- a/doc/licenses/guava-30.1-jre/README +++ b/doc/licenses/guava-30.1.1-jre/README @@ -1,7 +1,7 @@ Guava: Google Core Libraries for Java (https://github.com/google/guava) ----------------------------------------------------------------------- - Version: 30.1-jre + Version: 30.1.1-jre From: 'Google Inc.' (http://www.google.com/) License(s): Apache v2.0 diff --git a/doc/licenses/guava-30.1-jre/maven-coordinates.txt b/doc/licenses/guava-30.1.1-jre/maven-coordinates.txt similarity index 76% rename from doc/licenses/guava-30.1-jre/maven-coordinates.txt rename to doc/licenses/guava-30.1.1-jre/maven-coordinates.txt index 2b797965e..4394b3b17 100644 --- a/doc/licenses/guava-30.1-jre/maven-coordinates.txt +++ b/doc/licenses/guava-30.1.1-jre/maven-coordinates.txt @@ -1,3 +1,3 @@ com.google.guava:failureaccess:jar:1.0.1 -com.google.guava:guava:jar:30.1-jre +com.google.guava:guava:jar:30.1.1-jre com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava diff --git a/doc/licenses/guice-4.2.3/maven-coordinates.txt b/doc/licenses/guice-4.2.3/maven-coordinates.txt deleted file mode 100644 index c3fd4d98d..000000000 --- a/doc/licenses/guice-4.2.3/maven-coordinates.txt +++ /dev/null @@ -1,4 +0,0 @@ -com.google.inject.extensions:guice-assistedinject:jar:4.2.3 -com.google.inject.extensions:guice-multibindings:jar:4.2.3 -com.google.inject.extensions:guice-servlet:jar:4.2.3 -com.google.inject:guice:jar:4.2.3 diff --git a/doc/licenses/guice-4.2.3/README b/doc/licenses/guice-5.0.1/README similarity index 90% rename from doc/licenses/guice-4.2.3/README rename to doc/licenses/guice-5.0.1/README index 10ec893b8..12d4652f7 100644 --- a/doc/licenses/guice-4.2.3/README +++ b/doc/licenses/guice-5.0.1/README @@ -1,7 +1,7 @@ Google Guice (https://github.com/google/guice) ---------------------------------------------- - Version: 4.2.3 + Version: 5.0.1 From: 'Google Inc.' (http://www.google.com/) License(s): Apache v2.0 diff --git a/doc/licenses/guice-5.0.1/maven-coordinates.txt b/doc/licenses/guice-5.0.1/maven-coordinates.txt new file mode 100644 index 000000000..6648fef0c --- /dev/null +++ b/doc/licenses/guice-5.0.1/maven-coordinates.txt @@ -0,0 +1,3 @@ +com.google.inject:guice:jar:5.0.1 +com.google.inject.extensions:guice-assistedinject:jar:5.0.1 +com.google.inject.extensions:guice-servlet:jar:5.0.1 diff --git a/doc/licenses/jackson-2.10.1/maven-coordinates.txt b/doc/licenses/jackson-2.10.1/maven-coordinates.txt deleted file mode 100644 index fce75e9a8..000000000 --- a/doc/licenses/jackson-2.10.1/maven-coordinates.txt +++ /dev/null @@ -1,4 +0,0 @@ -com.fasterxml.jackson.core:jackson-annotations:jar:2.10.1 -com.fasterxml.jackson.core:jackson-core:jar:2.10.1 -com.fasterxml.jackson.core:jackson-databind:jar:2.10.1 -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.10.1 diff --git a/doc/licenses/jackson-2.10.1/NOTICE b/doc/licenses/jackson-2.12.2/NOTICE similarity index 62% rename from doc/licenses/jackson-2.10.1/NOTICE rename to doc/licenses/jackson-2.12.2/NOTICE index f4e5ea31f..e0b3fa0ed 100644 --- a/doc/licenses/jackson-2.10.1/NOTICE +++ b/doc/licenses/jackson-2.12.2/NOTICE @@ -1,5 +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, as well as supported -commercially by FasterXML.com. +It is currently developed by a community of developers. diff --git a/doc/licenses/jackson-2.10.1/README b/doc/licenses/jackson-2.12.2/README similarity index 90% rename from doc/licenses/jackson-2.10.1/README rename to doc/licenses/jackson-2.12.2/README index 358d6fe04..7ed615673 100644 --- a/doc/licenses/jackson-2.10.1/README +++ b/doc/licenses/jackson-2.12.2/README @@ -1,7 +1,7 @@ Jackson (https://github.com/FasterXML/jackson) ---------------------------------------------- - Version: 2.10.1 + Version: 2.12.2 From: 'FasterXML, LLC' (https://github.com/FasterXML) License(s): Apache v2.0 diff --git a/doc/licenses/jackson-2.12.2/maven-coordinates.txt b/doc/licenses/jackson-2.12.2/maven-coordinates.txt new file mode 100644 index 000000000..6dcc7917e --- /dev/null +++ b/doc/licenses/jackson-2.12.2/maven-coordinates.txt @@ -0,0 +1,4 @@ +com.fasterxml.jackson.core:jackson-databind:jar:2.12.2 +com.fasterxml.jackson.core:jackson-core:jar:2.12.2 +com.fasterxml.jackson.core:jackson-annotations:jar:2.12.2 +com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.12.2 diff --git a/doc/licenses/jai-imageio-core-1.3.1/maven-coordinates.txt b/doc/licenses/jai-imageio-core-1.3.1/maven-coordinates.txt deleted file mode 100644 index 11610abd3..000000000 --- a/doc/licenses/jai-imageio-core-1.3.1/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.github.jai-imageio:jai-imageio-core:jar:1.3.1 diff --git a/doc/licenses/jai-imageio-core-1.3.1/LICENSE.txt b/doc/licenses/jai-imageio-core-1.4.0/LICENSE.txt similarity index 100% rename from doc/licenses/jai-imageio-core-1.3.1/LICENSE.txt rename to doc/licenses/jai-imageio-core-1.4.0/LICENSE.txt diff --git a/doc/licenses/jai-imageio-core-1.3.1/README b/doc/licenses/jai-imageio-core-1.4.0/README similarity index 82% rename from doc/licenses/jai-imageio-core-1.3.1/README rename to doc/licenses/jai-imageio-core-1.4.0/README index 5344043df..6b0c70116 100644 --- a/doc/licenses/jai-imageio-core-1.3.1/README +++ b/doc/licenses/jai-imageio-core-1.4.0/README @@ -1,12 +1,12 @@ Java Advanced Imaging Image I/O (https://github.com/jai-imageio/jai-imageio-core) --------------------------------------------------------------------------------- - Version: 1.3.1 + Version: 1.4.0 From: 'Sun Microsystems, Inc.' (https://www.oracle.com/) 'University of Manchester' (https://www.manchester.ac.uk/) 'Stian Soiland-Reyes' (https://github.com/stain) 'Peter Hull' License(s): - BSD 3-clause (bundled/jai-imageio-core-1.3.1/LICENSE.txt) + BSD 3-clause (bundled/jai-imageio-core-1.4.0/LICENSE.txt) diff --git a/doc/licenses/jai-imageio-core-1.4.0/maven-coordinates.txt b/doc/licenses/jai-imageio-core-1.4.0/maven-coordinates.txt new file mode 100644 index 000000000..b62dccdef --- /dev/null +++ b/doc/licenses/jai-imageio-core-1.4.0/maven-coordinates.txt @@ -0,0 +1 @@ +com.github.jai-imageio:jai-imageio-core:jar:1.4.0 diff --git a/doc/licenses/java-saml-2.5.0/maven-coordinates.txt b/doc/licenses/java-saml-2.5.0/maven-coordinates.txt deleted file mode 100644 index 84a48eea7..000000000 --- a/doc/licenses/java-saml-2.5.0/maven-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.onelogin:java-saml-core:jar:2.5.0 -com.onelogin:java-saml:jar:2.5.0 diff --git a/doc/licenses/java-saml-2.5.0/LICENSE b/doc/licenses/java-saml-2.6.0/LICENSE similarity index 100% rename from doc/licenses/java-saml-2.5.0/LICENSE rename to doc/licenses/java-saml-2.6.0/LICENSE diff --git a/doc/licenses/java-saml-2.5.0/README b/doc/licenses/java-saml-2.6.0/README similarity index 73% rename from doc/licenses/java-saml-2.5.0/README rename to doc/licenses/java-saml-2.6.0/README index 7a47e79a7..80e38068b 100644 --- a/doc/licenses/java-saml-2.5.0/README +++ b/doc/licenses/java-saml-2.6.0/README @@ -1,8 +1,8 @@ Onelogin Java SAML Client (https://github.com/onelogin/java-saml) ------------------------------------------------------------------------ - Version: 2.5.0 + Version: 2.6.0 From: 'OneLogin' (https://www.onelogin.com) License(s): - MIT License (bundled/java-saml-2.5.0/LICENSE) + MIT License (bundled/java-saml-2.6.0/LICENSE) diff --git a/doc/licenses/java-saml-2.6.0/maven-coordinates.txt b/doc/licenses/java-saml-2.6.0/maven-coordinates.txt new file mode 100644 index 000000000..e8efd9b0a --- /dev/null +++ b/doc/licenses/java-saml-2.6.0/maven-coordinates.txt @@ -0,0 +1,2 @@ +com.onelogin:java-saml-core:jar:2.6.0 +com.onelogin:java-saml:jar:2.6.0 diff --git a/doc/licenses/jcommander-1.72/maven-coordinates.txt b/doc/licenses/jcommander-1.72/maven-coordinates.txt deleted file mode 100644 index 343ec2689..000000000 --- a/doc/licenses/jcommander-1.72/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.beust:jcommander:jar:1.72 diff --git a/doc/licenses/jcommander-1.72/NOTICE b/doc/licenses/jcommander-1.78/NOTICE similarity index 100% rename from doc/licenses/jcommander-1.72/NOTICE rename to doc/licenses/jcommander-1.78/NOTICE diff --git a/doc/licenses/jcommander-1.72/README b/doc/licenses/jcommander-1.78/README similarity index 90% rename from doc/licenses/jcommander-1.72/README rename to doc/licenses/jcommander-1.78/README index 57a44c59f..18567cc69 100644 --- a/doc/licenses/jcommander-1.72/README +++ b/doc/licenses/jcommander-1.78/README @@ -1,7 +1,7 @@ JCommander (https://jcommander.org/) ------------------------------------ - Version: 1.72 + Version: 1.78 From: 'Cédric Beust' (https://github.com/cbeust) License(s): Apache v2.0 diff --git a/doc/licenses/jcommander-1.78/maven-coordinates.txt b/doc/licenses/jcommander-1.78/maven-coordinates.txt new file mode 100644 index 000000000..1fef22d87 --- /dev/null +++ b/doc/licenses/jcommander-1.78/maven-coordinates.txt @@ -0,0 +1 @@ +com.beust:jcommander:jar:1.78 diff --git a/doc/licenses/jersey-2.31/maven-coordinates.txt b/doc/licenses/jersey-2.31/maven-coordinates.txt deleted file mode 100644 index 14c07defd..000000000 --- a/doc/licenses/jersey-2.31/maven-coordinates.txt +++ /dev/null @@ -1,8 +0,0 @@ -org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.31 -org.glassfish.jersey.core:jersey-client:jar:2.31 -org.glassfish.jersey.core:jersey-common:jar:2.31 -org.glassfish.jersey.core:jersey-server:jar:2.31 -org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.31 -org.glassfish.jersey.inject:jersey-hk2:jar:2.31 -org.glassfish.jersey.media:jersey-media-jaxb:jar:2.31 -org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.31 diff --git a/doc/licenses/jersey-2.31/LICENSE.md b/doc/licenses/jersey-2.33/LICENSE.md similarity index 100% rename from doc/licenses/jersey-2.31/LICENSE.md rename to doc/licenses/jersey-2.33/LICENSE.md diff --git a/doc/licenses/jersey-2.31/README b/doc/licenses/jersey-2.33/README similarity index 67% rename from doc/licenses/jersey-2.31/README rename to doc/licenses/jersey-2.33/README index d0886be1b..f1e86bad6 100644 --- a/doc/licenses/jersey-2.31/README +++ b/doc/licenses/jersey-2.33/README @@ -1,8 +1,8 @@ Jersey (https://jersey.java.net/) --------------------------------- - Version: 2.31 + Version: 2.33 From: 'Eclipse Foundation' (https://www.eclipse.org/) License(s): - EPL v2.0 (bundled/jersey-2.31/LICENSE.md) + EPL v2.0 (bundled/jersey-2.33/LICENSE.md) diff --git a/doc/licenses/jersey-2.33/maven-coordinates.txt b/doc/licenses/jersey-2.33/maven-coordinates.txt new file mode 100644 index 000000000..2bbb45f7e --- /dev/null +++ b/doc/licenses/jersey-2.33/maven-coordinates.txt @@ -0,0 +1,7 @@ +org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.33 +org.glassfish.jersey.core:jersey-common:jar:2.33 +org.glassfish.jersey.core:jersey-server:jar:2.33 +org.glassfish.jersey.core:jersey-client:jar:2.33 +org.glassfish.jersey.inject:jersey-hk2:jar:2.33 +org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.33 +org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.33 diff --git a/doc/licenses/joda-time-2.10.3/maven-coordinates.txt b/doc/licenses/joda-time-2.10.3/maven-coordinates.txt deleted file mode 100644 index f5633173b..000000000 --- a/doc/licenses/joda-time-2.10.3/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -joda-time:joda-time:jar:2.10.3 diff --git a/doc/licenses/joda-time-2.10.3/NOTICE b/doc/licenses/joda-time-2.10.6/NOTICE similarity index 100% rename from doc/licenses/joda-time-2.10.3/NOTICE rename to doc/licenses/joda-time-2.10.6/NOTICE diff --git a/doc/licenses/joda-time-2.10.3/README b/doc/licenses/joda-time-2.10.6/README similarity index 89% rename from doc/licenses/joda-time-2.10.3/README rename to doc/licenses/joda-time-2.10.6/README index 10c528b99..a10eaf616 100644 --- a/doc/licenses/joda-time-2.10.3/README +++ b/doc/licenses/joda-time-2.10.6/README @@ -1,7 +1,7 @@ Joda-Time (https://www.joda.org/joda-time/) ---------------------------------------------- - Version: 2.10.3 + Version: 2.10.6 From: 'Joda.org' (https://www.joda.org/) License(s): Apache v2.0 diff --git a/doc/licenses/joda-time-2.10.6/maven-coordinates.txt b/doc/licenses/joda-time-2.10.6/maven-coordinates.txt new file mode 100644 index 000000000..a210c5c6d --- /dev/null +++ b/doc/licenses/joda-time-2.10.6/maven-coordinates.txt @@ -0,0 +1 @@ +joda-time:joda-time:jar:2.10.6 diff --git a/doc/licenses/jose4j-0.5.5/maven-coordinates.txt b/doc/licenses/jose4j-0.5.5/maven-coordinates.txt deleted file mode 100644 index 19b112361..000000000 --- a/doc/licenses/jose4j-0.5.5/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.bitbucket.b_c:jose4j:jar:0.5.5 diff --git a/doc/licenses/jose4j-0.5.5/NOTICE b/doc/licenses/jose4j-0.7.6/NOTICE similarity index 100% rename from doc/licenses/jose4j-0.5.5/NOTICE rename to doc/licenses/jose4j-0.7.6/NOTICE diff --git a/doc/licenses/jose4j-0.5.5/README b/doc/licenses/jose4j-0.7.6/README similarity index 90% rename from doc/licenses/jose4j-0.5.5/README rename to doc/licenses/jose4j-0.7.6/README index 144c54010..59051bd57 100644 --- a/doc/licenses/jose4j-0.5.5/README +++ b/doc/licenses/jose4j-0.7.6/README @@ -1,7 +1,7 @@ jose.4.j (https://bitbucket.org/b_c/jose4j/) -------------------------------------------- - Version: 0.5.5 + Version: 0.7.6 From: 'Brian Campbell' (https://bitbucket.org/b_c/) License(s): Apache v2.0 diff --git a/doc/licenses/jose4j-0.7.6/maven-coordinates.txt b/doc/licenses/jose4j-0.7.6/maven-coordinates.txt new file mode 100644 index 000000000..4cd8dff40 --- /dev/null +++ b/doc/licenses/jose4j-0.7.6/maven-coordinates.txt @@ -0,0 +1 @@ +org.bitbucket.b_c:jose4j:jar:0.7.6 diff --git a/doc/licenses/mybatis-3.2.8/maven-coordinates.txt b/doc/licenses/mybatis-3.2.8/maven-coordinates.txt deleted file mode 100644 index 4ed2def8f..000000000 --- a/doc/licenses/mybatis-3.2.8/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.mybatis:mybatis:jar:3.4.6 diff --git a/doc/licenses/mybatis-3.2.8/NOTICE b/doc/licenses/mybatis-3.5.6/NOTICE similarity index 100% rename from doc/licenses/mybatis-3.2.8/NOTICE rename to doc/licenses/mybatis-3.5.6/NOTICE diff --git a/doc/licenses/mybatis-3.2.8/README b/doc/licenses/mybatis-3.5.6/README similarity index 90% rename from doc/licenses/mybatis-3.2.8/README rename to doc/licenses/mybatis-3.5.6/README index 0d21129a5..c94fb8c26 100644 --- a/doc/licenses/mybatis-3.2.8/README +++ b/doc/licenses/mybatis-3.5.6/README @@ -1,7 +1,7 @@ MyBatis (http://www.mybatis.org/mybatis-3/) ------------------------------------------- - Version: 3.2.8 + Version: 3.5.6 From: 'MyBatis' (http://www.mybatis.org/) License(s): Apache v2.0 diff --git a/doc/licenses/mybatis-3.5.6/maven-coordinates.txt b/doc/licenses/mybatis-3.5.6/maven-coordinates.txt new file mode 100644 index 000000000..31ff49c9d --- /dev/null +++ b/doc/licenses/mybatis-3.5.6/maven-coordinates.txt @@ -0,0 +1 @@ +org.mybatis:mybatis:jar:3.5.6 diff --git a/doc/licenses/mybatis-guice-3.6/NOTICE b/doc/licenses/mybatis-guice-3.10/NOTICE similarity index 100% rename from doc/licenses/mybatis-guice-3.6/NOTICE rename to doc/licenses/mybatis-guice-3.10/NOTICE diff --git a/doc/licenses/mybatis-guice-3.6/README b/doc/licenses/mybatis-guice-3.10/README similarity index 90% rename from doc/licenses/mybatis-guice-3.6/README rename to doc/licenses/mybatis-guice-3.10/README index 53fcd829c..00315a753 100644 --- a/doc/licenses/mybatis-guice-3.6/README +++ b/doc/licenses/mybatis-guice-3.10/README @@ -1,7 +1,7 @@ MyBatis-Guice (http://www.mybatis.org/guice/) --------------------------------------------- - Version: 3.6 + Version: 3.10 From: 'MyBatis' (http://www.mybatis.org/) License(s): Apache v2.0 diff --git a/doc/licenses/mybatis-guice-3.6/maven-coordinates.txt b/doc/licenses/mybatis-guice-3.10/maven-coordinates.txt similarity index 100% rename from doc/licenses/mybatis-guice-3.6/maven-coordinates.txt rename to doc/licenses/mybatis-guice-3.10/maven-coordinates.txt diff --git a/doc/licenses/spring-framework-5.2.9/README b/doc/licenses/spring-framework-5.2.13/README similarity index 91% rename from doc/licenses/spring-framework-5.2.9/README rename to doc/licenses/spring-framework-5.2.13/README index a93d705d2..ef8f91645 100644 --- a/doc/licenses/spring-framework-5.2.9/README +++ b/doc/licenses/spring-framework-5.2.13/README @@ -1,7 +1,7 @@ Spring Framework (https://spring.io/projects/spring-framework) -------------------------------------------------------------- - Version: 5.2.9 + Version: 5.2.13 From: 'Spring' (https://spring.io/) License(s): Apache v2.0 diff --git a/doc/licenses/spring-framework-5.2.13/maven-coordinates.txt b/doc/licenses/spring-framework-5.2.13/maven-coordinates.txt new file mode 100644 index 000000000..0cf256050 --- /dev/null +++ b/doc/licenses/spring-framework-5.2.13/maven-coordinates.txt @@ -0,0 +1,7 @@ +org.springframework:spring-aop:jar:5.2.13.RELEASE +org.springframework:spring-beans:jar:5.2.13.RELEASE +org.springframework:spring-context:jar:5.2.13.RELEASE +org.springframework:spring-core:jar:5.2.13.RELEASE +org.springframework:spring-expression:jar:5.2.13.RELEASE +org.springframework:spring-jcl:jar:5.2.13.RELEASE +org.springframework:spring-web:jar:5.2.13.RELEASE diff --git a/doc/licenses/spring-framework-5.2.9/maven-coordinates.txt b/doc/licenses/spring-framework-5.2.9/maven-coordinates.txt deleted file mode 100644 index 9318b4255..000000000 --- a/doc/licenses/spring-framework-5.2.9/maven-coordinates.txt +++ /dev/null @@ -1,7 +0,0 @@ -org.springframework:spring-aop:jar:5.2.9.RELEASE -org.springframework:spring-beans:jar:5.2.9.RELEASE -org.springframework:spring-context:jar:5.2.9.RELEASE -org.springframework:spring-core:jar:5.2.9.RELEASE -org.springframework:spring-expression:jar:5.2.9.RELEASE -org.springframework:spring-jcl:jar:5.2.9.RELEASE -org.springframework:spring-web:jar:5.2.9.RELEASE diff --git a/doc/licenses/spring-security-5.4.1/maven-coordinates.txt b/doc/licenses/spring-security-5.4.1/maven-coordinates.txt deleted file mode 100644 index 59bd56ce4..000000000 --- a/doc/licenses/spring-security-5.4.1/maven-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.security:spring-security-core:jar:5.4.1 -org.springframework.security:spring-security-web:jar:5.4.1 diff --git a/doc/licenses/spring-security-5.4.1/NOTICE b/doc/licenses/spring-security-5.4.5/NOTICE similarity index 100% rename from doc/licenses/spring-security-5.4.1/NOTICE rename to doc/licenses/spring-security-5.4.5/NOTICE diff --git a/doc/licenses/spring-security-5.4.1/README b/doc/licenses/spring-security-5.4.5/README similarity index 91% rename from doc/licenses/spring-security-5.4.1/README rename to doc/licenses/spring-security-5.4.5/README index c2ca8785a..d40cb1b19 100644 --- a/doc/licenses/spring-security-5.4.1/README +++ b/doc/licenses/spring-security-5.4.5/README @@ -1,7 +1,7 @@ Spring Security (https://spring.io/projects/spring-security) ------------------------------------------------------------ - Version: 5.4.1 + Version: 5.4.5 From: 'Spring' (https://spring.io/) License(s): Apache v2.0 diff --git a/doc/licenses/spring-security-5.4.5/maven-coordinates.txt b/doc/licenses/spring-security-5.4.5/maven-coordinates.txt new file mode 100644 index 000000000..b4b3b510b --- /dev/null +++ b/doc/licenses/spring-security-5.4.5/maven-coordinates.txt @@ -0,0 +1,2 @@ +org.springframework.security:spring-security-core:jar:5.4.5 +org.springframework.security:spring-security-web:jar:5.4.5 diff --git a/doc/licenses/woodstox-core-5.0.3/maven-coordinates.txt b/doc/licenses/woodstox-core-5.0.3/maven-coordinates.txt deleted file mode 100644 index ad6f7caa3..000000000 --- a/doc/licenses/woodstox-core-5.0.3/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.fasterxml.woodstox:woodstox-core:jar:5.0.3 diff --git a/doc/licenses/woodstox-core-5.0.3/README b/doc/licenses/woodstox-core-5.2.1/README similarity index 91% rename from doc/licenses/woodstox-core-5.0.3/README rename to doc/licenses/woodstox-core-5.2.1/README index f28ca58a6..1f743475a 100644 --- a/doc/licenses/woodstox-core-5.0.3/README +++ b/doc/licenses/woodstox-core-5.2.1/README @@ -1,7 +1,7 @@ Woodstox Core (https://github.com/FasterXML/woodstox) ------------------------------------------------------ - Version: 5.0.3 + Version: 5.2.1 From: 'FasterXML, LLC' (http://fasterxml.com/) License(s): Apache v2.0 diff --git a/doc/licenses/woodstox-core-5.2.1/maven-coordinates.txt b/doc/licenses/woodstox-core-5.2.1/maven-coordinates.txt new file mode 100644 index 000000000..8538fcc66 --- /dev/null +++ b/doc/licenses/woodstox-core-5.2.1/maven-coordinates.txt @@ -0,0 +1 @@ +com.fasterxml.woodstox:woodstox-core:jar:5.2.1 diff --git a/doc/licenses/woodstox-stax2-api-3.1.4/maven-coordinates.txt b/doc/licenses/woodstox-stax2-api-3.1.4/maven-coordinates.txt deleted file mode 100644 index fe783ff9f..000000000 --- a/doc/licenses/woodstox-stax2-api-3.1.4/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.codehaus.woodstox:stax2-api:jar:3.1.4 diff --git a/doc/licenses/woodstox-stax2-api-3.1.4/LICENSE b/doc/licenses/woodstox-stax2-api-4.2/LICENSE similarity index 92% rename from doc/licenses/woodstox-stax2-api-3.1.4/LICENSE rename to doc/licenses/woodstox-stax2-api-4.2/LICENSE index 19cbb6b58..c7a901abf 100644 --- a/doc/licenses/woodstox-stax2-api-3.1.4/LICENSE +++ b/doc/licenses/woodstox-stax2-api-4.2/LICENSE @@ -1,4 +1,4 @@ -Copyright 2008 FasterXML LLC +Copyright 2010 FasterXML, LLC Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -19,4 +19,4 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/doc/licenses/woodstox-stax2-api-3.1.4/README b/doc/licenses/woodstox-stax2-api-4.2/README similarity index 69% rename from doc/licenses/woodstox-stax2-api-3.1.4/README rename to doc/licenses/woodstox-stax2-api-4.2/README index fcfb1af18..9666e4bba 100644 --- a/doc/licenses/woodstox-stax2-api-3.1.4/README +++ b/doc/licenses/woodstox-stax2-api-4.2/README @@ -1,8 +1,8 @@ Woodstox Stax2-API (https://github.com/FasterXML/stax2-api) ------------------------------------------------------------ - Version: 3.1.4 + Version: 4.2 From: 'FasterXML, LLC' (http://fasterxml.com/) License(s): - BSD Simplified (bundled/woodstox-stax2-api-3.1.4/LICENSE) + BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE) diff --git a/doc/licenses/woodstox-stax2-api-4.2/maven-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2/maven-coordinates.txt new file mode 100644 index 000000000..c7bbc763f --- /dev/null +++ b/doc/licenses/woodstox-stax2-api-4.2/maven-coordinates.txt @@ -0,0 +1 @@ +org.codehaus.woodstox:stax2-api:jar:4.2 diff --git a/doc/licenses/zxing-3.3.1/maven-coordinates.txt b/doc/licenses/zxing-3.3.1/maven-coordinates.txt deleted file mode 100644 index 58624842f..000000000 --- a/doc/licenses/zxing-3.3.1/maven-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.google.zxing:core:jar:3.3.1 -com.google.zxing:javase:jar:3.3.1 diff --git a/doc/licenses/zxing-3.3.1/NOTICE b/doc/licenses/zxing-3.4.1/NOTICE similarity index 100% rename from doc/licenses/zxing-3.3.1/NOTICE rename to doc/licenses/zxing-3.4.1/NOTICE diff --git a/doc/licenses/zxing-3.3.1/README b/doc/licenses/zxing-3.4.1/README similarity index 85% rename from doc/licenses/zxing-3.3.1/README rename to doc/licenses/zxing-3.4.1/README index 6664953dd..497049963 100644 --- a/doc/licenses/zxing-3.3.1/README +++ b/doc/licenses/zxing-3.4.1/README @@ -1,8 +1,8 @@ ZXing Barcode Scanning Library (https://github.com/zxing/zxing/) ---------------------------------------------------------------- - Version: 3.3.1 - From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.3.1/AUTHORS) + Version: 3.4.1 + From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.4.1/AUTHORS) License(s): Apache v2.0 diff --git a/doc/licenses/zxing-3.4.1/maven-coordinates.txt b/doc/licenses/zxing-3.4.1/maven-coordinates.txt new file mode 100644 index 000000000..b7415931d --- /dev/null +++ b/doc/licenses/zxing-3.4.1/maven-coordinates.txt @@ -0,0 +1,2 @@ +com.google.zxing:core:jar:3.4.1 +com.google.zxing:javase:jar:3.4.1 From 9b90376ef3614fe6ee0e8d93959dc1a67132674c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 3 Apr 2021 19:26:46 -0700 Subject: [PATCH 07/11] GUACAMOLE-773: Remove license documentation for dependencies that are no longer bundled. --- .../jakarta-activation-1.2.2/LICENSE.md | 29 ------------------- doc/licenses/jakarta-activation-1.2.2/README | 8 ----- .../maven-coordinates.txt | 2 -- doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md | 28 ------------------ doc/licenses/jakarta-jaxb-2.3.3/README | 8 ----- .../jakarta-jaxb-2.3.3/maven-coordinates.txt | 1 - doc/licenses/jaxb-fi-1.2.16/NOTICE | 11 ------- doc/licenses/jaxb-fi-1.2.16/README | 8 ----- .../jaxb-fi-1.2.16/maven-coordinates.txt | 1 - doc/licenses/jaxb-istack-commons/LICENSE.md | 29 ------------------- doc/licenses/jaxb-istack-commons/README | 9 ------ .../jaxb-istack-commons/maven-coordinates.txt | 1 - doc/licenses/stax-ex-1.8.1/LICENSE.md | 29 ------------------- doc/licenses/stax-ex-1.8.1/README | 8 ----- .../stax-ex-1.8.1/maven-coordinates.txt | 1 - 15 files changed, 173 deletions(-) delete mode 100644 doc/licenses/jakarta-activation-1.2.2/LICENSE.md delete mode 100644 doc/licenses/jakarta-activation-1.2.2/README delete mode 100644 doc/licenses/jakarta-activation-1.2.2/maven-coordinates.txt delete mode 100644 doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md delete mode 100644 doc/licenses/jakarta-jaxb-2.3.3/README delete mode 100644 doc/licenses/jakarta-jaxb-2.3.3/maven-coordinates.txt delete mode 100644 doc/licenses/jaxb-fi-1.2.16/NOTICE delete mode 100644 doc/licenses/jaxb-fi-1.2.16/README delete mode 100644 doc/licenses/jaxb-fi-1.2.16/maven-coordinates.txt delete mode 100644 doc/licenses/jaxb-istack-commons/LICENSE.md delete mode 100644 doc/licenses/jaxb-istack-commons/README delete mode 100644 doc/licenses/jaxb-istack-commons/maven-coordinates.txt delete mode 100644 doc/licenses/stax-ex-1.8.1/LICENSE.md delete mode 100644 doc/licenses/stax-ex-1.8.1/README delete mode 100644 doc/licenses/stax-ex-1.8.1/maven-coordinates.txt diff --git a/doc/licenses/jakarta-activation-1.2.2/LICENSE.md b/doc/licenses/jakarta-activation-1.2.2/LICENSE.md deleted file mode 100644 index e0358f972..000000000 --- a/doc/licenses/jakarta-activation-1.2.2/LICENSE.md +++ /dev/null @@ -1,29 +0,0 @@ - - Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - - Neither the name of the Eclipse Foundation, Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/doc/licenses/jakarta-activation-1.2.2/README b/doc/licenses/jakarta-activation-1.2.2/README deleted file mode 100644 index 0320bc71a..000000000 --- a/doc/licenses/jakarta-activation-1.2.2/README +++ /dev/null @@ -1,8 +0,0 @@ -Jakarta Activation (https://eclipse-ee4j.github.io/jaf/) --------------------------------------------------------- - - Version: 1.2.2 - From: 'Oracle Corporation' (http://www.oracle.com/) - License(s): - BSD 3-clause (bundled/jakarta-activation-1.2.2/LICENSE.md) - diff --git a/doc/licenses/jakarta-activation-1.2.2/maven-coordinates.txt b/doc/licenses/jakarta-activation-1.2.2/maven-coordinates.txt deleted file mode 100644 index 2dd52691b..000000000 --- a/doc/licenses/jakarta-activation-1.2.2/maven-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.sun.activation:jakarta.activation:jar:1.2.2 -jakarta.activation:jakarta.activation-api:jar:1.2.2 diff --git a/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md b/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md deleted file mode 100644 index da1c1cea7..000000000 --- a/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - - Neither the name of the Eclipse Foundation, Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/doc/licenses/jakarta-jaxb-2.3.3/README b/doc/licenses/jakarta-jaxb-2.3.3/README deleted file mode 100644 index b0d753d1a..000000000 --- a/doc/licenses/jakarta-jaxb-2.3.3/README +++ /dev/null @@ -1,8 +0,0 @@ -Jakarta XML Binding (https://eclipse-ee4j.github.io/jaxb-ri/) -------------------------------------------------------------- - - Version: 2.3.3 - From: 'Oracle Corporation' (http://www.oracle.com/) - License(s): - BSD 3-clause (bundled/jakarta-jaxb-2.3.3/LICENSE.md) - diff --git a/doc/licenses/jakarta-jaxb-2.3.3/maven-coordinates.txt b/doc/licenses/jakarta-jaxb-2.3.3/maven-coordinates.txt deleted file mode 100644 index b8bef17b2..000000000 --- a/doc/licenses/jakarta-jaxb-2.3.3/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3 diff --git a/doc/licenses/jaxb-fi-1.2.16/NOTICE b/doc/licenses/jaxb-fi-1.2.16/NOTICE deleted file mode 100644 index 42eedf780..000000000 --- a/doc/licenses/jaxb-fi-1.2.16/NOTICE +++ /dev/null @@ -1,11 +0,0 @@ -# Notices for Eclipse Implementation of JAXB - -This content is produced and maintained by the Eclipse Implementation of JAXB -project. - -* Project home: https://projects.eclipse.org/projects/ee4j.jaxb-impl - -## Trademarks - -Eclipse Implementation of JAXB is a trademark of the Eclipse Foundation. - diff --git a/doc/licenses/jaxb-fi-1.2.16/README b/doc/licenses/jaxb-fi-1.2.16/README deleted file mode 100644 index 932ea5426..000000000 --- a/doc/licenses/jaxb-fi-1.2.16/README +++ /dev/null @@ -1,8 +0,0 @@ -Fast Infoset (https://github.com/eclipse-ee4j/jaxb-fi/) -------------------------------------------------------- - - Version: 1.2.16 - From: 'Oracle Corporation' (http://www.oracle.com/) - License(s): - Apache v2.0 - diff --git a/doc/licenses/jaxb-fi-1.2.16/maven-coordinates.txt b/doc/licenses/jaxb-fi-1.2.16/maven-coordinates.txt deleted file mode 100644 index 313dbf106..000000000 --- a/doc/licenses/jaxb-fi-1.2.16/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.sun.xml.fastinfoset:FastInfoset:jar:1.2.16 diff --git a/doc/licenses/jaxb-istack-commons/LICENSE.md b/doc/licenses/jaxb-istack-commons/LICENSE.md deleted file mode 100644 index c739f78bc..000000000 --- a/doc/licenses/jaxb-istack-commons/LICENSE.md +++ /dev/null @@ -1,29 +0,0 @@ - - Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - - Neither the name of the Eclipse Foundation, Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/doc/licenses/jaxb-istack-commons/README b/doc/licenses/jaxb-istack-commons/README deleted file mode 100644 index 3f52eaad6..000000000 --- a/doc/licenses/jaxb-istack-commons/README +++ /dev/null @@ -1,9 +0,0 @@ -iStack Common Utility Code -(https://github.com/eclipse-ee4j/jaxb-istack-commons) ------------------------------------------------------ - - Version: 3.0.8 - From: 'Oracle Corporation' (http://www.oracle.com/) - License(s): - BSD 3-clause (bundled/jakarta-activation-3.0.8/LICENSE.md) - diff --git a/doc/licenses/jaxb-istack-commons/maven-coordinates.txt b/doc/licenses/jaxb-istack-commons/maven-coordinates.txt deleted file mode 100644 index 24f2577d4..000000000 --- a/doc/licenses/jaxb-istack-commons/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.sun.istack:istack-commons-runtime:jar:3.0.8 diff --git a/doc/licenses/stax-ex-1.8.1/LICENSE.md b/doc/licenses/stax-ex-1.8.1/LICENSE.md deleted file mode 100644 index c739f78bc..000000000 --- a/doc/licenses/stax-ex-1.8.1/LICENSE.md +++ /dev/null @@ -1,29 +0,0 @@ - - Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - - Neither the name of the Eclipse Foundation, Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/doc/licenses/stax-ex-1.8.1/README b/doc/licenses/stax-ex-1.8.1/README deleted file mode 100644 index bc4ecf323..000000000 --- a/doc/licenses/stax-ex-1.8.1/README +++ /dev/null @@ -1,8 +0,0 @@ -Extended StAX API (https://github.com/eclipse-ee4j/jaxb-stax-ex) ----------------------------------------------------------------- - - Version: 1.8.1 - From: 'Oracle Corporation' (http://www.oracle.com/) - License(s): - BSD 3-clause (bundled/stax-ex-1.8.1/LICENSE.md) - diff --git a/doc/licenses/stax-ex-1.8.1/maven-coordinates.txt b/doc/licenses/stax-ex-1.8.1/maven-coordinates.txt deleted file mode 100644 index 3140cedc1..000000000 --- a/doc/licenses/stax-ex-1.8.1/maven-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.jvnet.staxex:stax-ex:jar:1.8.1 From 4246acf24e0737c4892d31c6f83d0cf1f0bff38b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 26 Apr 2021 12:53:23 -0700 Subject: [PATCH 08/11] GUACAMOLE-773: Update Jersey from 2.33 to 2.34. --- doc/licenses/jersey-2.33/maven-coordinates.txt | 7 ------- doc/licenses/{jersey-2.33 => jersey-2.34}/LICENSE.md | 0 doc/licenses/{jersey-2.33 => jersey-2.34}/README | 4 ++-- doc/licenses/jersey-2.34/maven-coordinates.txt | 7 +++++++ pom.xml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 doc/licenses/jersey-2.33/maven-coordinates.txt rename doc/licenses/{jersey-2.33 => jersey-2.34}/LICENSE.md (100%) rename doc/licenses/{jersey-2.33 => jersey-2.34}/README (67%) create mode 100644 doc/licenses/jersey-2.34/maven-coordinates.txt diff --git a/doc/licenses/jersey-2.33/maven-coordinates.txt b/doc/licenses/jersey-2.33/maven-coordinates.txt deleted file mode 100644 index 2bbb45f7e..000000000 --- a/doc/licenses/jersey-2.33/maven-coordinates.txt +++ /dev/null @@ -1,7 +0,0 @@ -org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.33 -org.glassfish.jersey.core:jersey-common:jar:2.33 -org.glassfish.jersey.core:jersey-server:jar:2.33 -org.glassfish.jersey.core:jersey-client:jar:2.33 -org.glassfish.jersey.inject:jersey-hk2:jar:2.33 -org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.33 -org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.33 diff --git a/doc/licenses/jersey-2.33/LICENSE.md b/doc/licenses/jersey-2.34/LICENSE.md similarity index 100% rename from doc/licenses/jersey-2.33/LICENSE.md rename to doc/licenses/jersey-2.34/LICENSE.md diff --git a/doc/licenses/jersey-2.33/README b/doc/licenses/jersey-2.34/README similarity index 67% rename from doc/licenses/jersey-2.33/README rename to doc/licenses/jersey-2.34/README index f1e86bad6..dd10ad4e6 100644 --- a/doc/licenses/jersey-2.33/README +++ b/doc/licenses/jersey-2.34/README @@ -1,8 +1,8 @@ Jersey (https://jersey.java.net/) --------------------------------- - Version: 2.33 + Version: 2.34 From: 'Eclipse Foundation' (https://www.eclipse.org/) License(s): - EPL v2.0 (bundled/jersey-2.33/LICENSE.md) + EPL v2.0 (bundled/jersey-2.34/LICENSE.md) diff --git a/doc/licenses/jersey-2.34/maven-coordinates.txt b/doc/licenses/jersey-2.34/maven-coordinates.txt new file mode 100644 index 000000000..9f3852525 --- /dev/null +++ b/doc/licenses/jersey-2.34/maven-coordinates.txt @@ -0,0 +1,7 @@ +org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.34 +org.glassfish.jersey.core:jersey-common:jar:2.34 +org.glassfish.jersey.core:jersey-server:jar:2.34 +org.glassfish.jersey.core:jersey-client:jar:2.34 +org.glassfish.jersey.inject:jersey-hk2:jar:2.34 +org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.34 +org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.34 diff --git a/pom.xml b/pom.xml index c5b68294d..f9035b039 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ 5.0.1 2.6.1 2.12.2 - 2.33 + 2.34 5.7.1 1.2.3 1.7.30 From f5b76806a41bd4b6dedcef6885d14df39759b9c1 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 26 Apr 2021 13:37:04 -0700 Subject: [PATCH 09/11] GUACAMOLE-773: Update to latest version of JUnit 4.x. --- extensions/guacamole-auth-quickconnect/pom.xml | 1 - extensions/guacamole-auth-totp/pom.xml | 1 - guacamole-common/pom.xml | 1 - guacamole-ext/pom.xml | 1 - pom.xml | 11 ++++++++++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml index f9ad11529..213122f8b 100644 --- a/extensions/guacamole-auth-quickconnect/pom.xml +++ b/extensions/guacamole-auth-quickconnect/pom.xml @@ -120,7 +120,6 @@ junit junit - 4.10 test diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml index d40e33002..a0304886e 100644 --- a/extensions/guacamole-auth-totp/pom.xml +++ b/extensions/guacamole-auth-totp/pom.xml @@ -155,7 +155,6 @@ junit junit - 4.12 test diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index b95098286..ca08ebcdc 100644 --- a/guacamole-common/pom.xml +++ b/guacamole-common/pom.xml @@ -101,7 +101,6 @@ junit junit - 4.10 test diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index fddfc0600..5258f71c2 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -95,7 +95,6 @@ junit junit - 4.10 test diff --git a/pom.xml b/pom.xml index f9035b039..fc6078b49 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ 2.12.2 2.34 5.7.1 + 4.13.2 1.2.3 1.7.30 @@ -370,7 +371,7 @@ ${logback.version} - + org.junit.jupiter junit-jupiter-api @@ -387,6 +388,14 @@ ${junit.version} + + + junit + junit + ${junit4.version} + test + + From af0b2ec5c20b4ea1b181bf10591f6c944f2b6760 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 26 Apr 2021 15:47:12 -0700 Subject: [PATCH 10/11] GUACAMOLE-773: Use HTTPS for all LICENSE information URLs pointing to Apache. --- NOTICE | 2 +- doc/guacamole-branding-example/licenses/NOTICE | 2 +- doc/licenses/apache-commons-beanutils-1.7.0/README | 2 +- doc/licenses/apache-commons-chain-1.2/README | 2 +- doc/licenses/apache-commons-codec-1.14/README | 2 +- doc/licenses/apache-commons-codec-1.15/README | 2 +- doc/licenses/apache-commons-collections-3.2/README | 2 +- doc/licenses/apache-commons-collections-4.4/README | 2 +- doc/licenses/apache-commons-configuration-1.5/README | 2 +- doc/licenses/apache-commons-digester-1.8/README | 2 +- doc/licenses/apache-commons-lang-2.3/README | 2 +- doc/licenses/apache-commons-lang-3.11/README | 2 +- doc/licenses/apache-commons-lang-3.9/README | 2 +- doc/licenses/apache-commons-logging-1.1.1/README | 2 +- doc/licenses/apache-commons-pool-1.5.4/README | 2 +- doc/licenses/apache-commons-pool-2.8.0/README | 2 +- doc/licenses/apache-mina-2.1.3/README | 2 +- doc/licenses/apache-santuario-2.2.0/README | 2 +- doc/licenses/directory-api-2.0.1/README | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NOTICE b/NOTICE index c5fc0d3af..b0fa030e6 100644 --- a/NOTICE +++ b/NOTICE @@ -2,4 +2,4 @@ Apache Guacamole Copyright 2020 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/doc/guacamole-branding-example/licenses/NOTICE b/doc/guacamole-branding-example/licenses/NOTICE index c5fc0d3af..b0fa030e6 100644 --- a/doc/guacamole-branding-example/licenses/NOTICE +++ b/doc/guacamole-branding-example/licenses/NOTICE @@ -2,4 +2,4 @@ Apache Guacamole Copyright 2020 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/doc/licenses/apache-commons-beanutils-1.7.0/README b/doc/licenses/apache-commons-beanutils-1.7.0/README index a984764a0..e5397657f 100644 --- a/doc/licenses/apache-commons-beanutils-1.7.0/README +++ b/doc/licenses/apache-commons-beanutils-1.7.0/README @@ -3,7 +3,7 @@ Apache Commons BeanUtils ----------------------------------------------------- Version: 1.7.0 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-chain-1.2/README b/doc/licenses/apache-commons-chain-1.2/README index fb0d7ad57..50c81fc54 100644 --- a/doc/licenses/apache-commons-chain-1.2/README +++ b/doc/licenses/apache-commons-chain-1.2/README @@ -3,7 +3,7 @@ Apache Commons Chain ------------------------------------------------- Version: 1.2 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-codec-1.14/README b/doc/licenses/apache-commons-codec-1.14/README index cbdc2b861..a32ab8bc6 100644 --- a/doc/licenses/apache-commons-codec-1.14/README +++ b/doc/licenses/apache-commons-codec-1.14/README @@ -2,7 +2,7 @@ Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) ----------------------------------------------------------------------- Version: 1.14 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-codec-1.15/README b/doc/licenses/apache-commons-codec-1.15/README index 95038e00a..eed5894c9 100644 --- a/doc/licenses/apache-commons-codec-1.15/README +++ b/doc/licenses/apache-commons-codec-1.15/README @@ -2,7 +2,7 @@ Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) ----------------------------------------------------------------------- Version: 1.15 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-collections-3.2/README b/doc/licenses/apache-commons-collections-3.2/README index b7ba158c6..ea7f6be8b 100644 --- a/doc/licenses/apache-commons-collections-3.2/README +++ b/doc/licenses/apache-commons-collections-3.2/README @@ -3,7 +3,7 @@ Apache Commons Collections ------------------------------------------------------- Version: 3.2 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-collections-4.4/README b/doc/licenses/apache-commons-collections-4.4/README index 972b6167b..929d3e339 100644 --- a/doc/licenses/apache-commons-collections-4.4/README +++ b/doc/licenses/apache-commons-collections-4.4/README @@ -3,7 +3,7 @@ Apache Commons Collections ------------------------------------------------------- Version: 4.4 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-configuration-1.5/README b/doc/licenses/apache-commons-configuration-1.5/README index 691e14443..96f1af03b 100644 --- a/doc/licenses/apache-commons-configuration-1.5/README +++ b/doc/licenses/apache-commons-configuration-1.5/README @@ -3,7 +3,7 @@ Apache Commons Configuration --------------------------------------------------------- Version: 1.5 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-digester-1.8/README b/doc/licenses/apache-commons-digester-1.8/README index 67bcf68fd..9c5e0bee9 100644 --- a/doc/licenses/apache-commons-digester-1.8/README +++ b/doc/licenses/apache-commons-digester-1.8/README @@ -3,7 +3,7 @@ Apache Commons Digester ---------------------------------------------------- Version: 1.8 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-lang-2.3/README b/doc/licenses/apache-commons-lang-2.3/README index 9c5cd590b..98aca677f 100644 --- a/doc/licenses/apache-commons-lang-2.3/README +++ b/doc/licenses/apache-commons-lang-2.3/README @@ -2,7 +2,7 @@ Apache Commons Lang (http://commons.apache.org/proper/commons-lang/) -------------------------------------------------------------------- Version: 2.3 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-lang-3.11/README b/doc/licenses/apache-commons-lang-3.11/README index 07c1d93fd..013d7304e 100644 --- a/doc/licenses/apache-commons-lang-3.11/README +++ b/doc/licenses/apache-commons-lang-3.11/README @@ -2,7 +2,7 @@ Apache Commons Lang (http://commons.apache.org/proper/commons-lang/) -------------------------------------------------------------------- Version: 3.11 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-lang-3.9/README b/doc/licenses/apache-commons-lang-3.9/README index f5532e08e..c4032ed94 100644 --- a/doc/licenses/apache-commons-lang-3.9/README +++ b/doc/licenses/apache-commons-lang-3.9/README @@ -2,7 +2,7 @@ Apache Commons Lang (http://commons.apache.org/proper/commons-lang/) -------------------------------------------------------------------- Version: 3.9 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-logging-1.1.1/README b/doc/licenses/apache-commons-logging-1.1.1/README index 1fd5c3cea..14cf5ad20 100644 --- a/doc/licenses/apache-commons-logging-1.1.1/README +++ b/doc/licenses/apache-commons-logging-1.1.1/README @@ -3,7 +3,7 @@ Apache Commons Logging --------------------------------------------------- Version: 1.1.1 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-pool-1.5.4/README b/doc/licenses/apache-commons-pool-1.5.4/README index f99d12556..54d7fd746 100644 --- a/doc/licenses/apache-commons-pool-1.5.4/README +++ b/doc/licenses/apache-commons-pool-1.5.4/README @@ -2,7 +2,7 @@ Apache Commons Pool (http://commons.apache.org/proper/commons-pool/) -------------------------------------------------------------------- Version: 1.5.4 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-pool-2.8.0/README b/doc/licenses/apache-commons-pool-2.8.0/README index 9d3020ee0..7e11dd051 100644 --- a/doc/licenses/apache-commons-pool-2.8.0/README +++ b/doc/licenses/apache-commons-pool-2.8.0/README @@ -2,7 +2,7 @@ Apache Commons Pool (http://commons.apache.org/proper/commons-pool/) -------------------------------------------------------------------- Version: 2.8.0 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-mina-2.1.3/README b/doc/licenses/apache-mina-2.1.3/README index 8b4d9cfbd..c07086d16 100644 --- a/doc/licenses/apache-mina-2.1.3/README +++ b/doc/licenses/apache-mina-2.1.3/README @@ -2,7 +2,7 @@ Apache Mina (https://mina.apache.org/) -------------------------------------- Version: 2.1.3 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-santuario-2.2.0/README b/doc/licenses/apache-santuario-2.2.0/README index 104934784..e73ff54fa 100644 --- a/doc/licenses/apache-santuario-2.2.0/README +++ b/doc/licenses/apache-santuario-2.2.0/README @@ -2,7 +2,7 @@ Apache Santuario (https://santuario.apache.org/) ------------------------------------------------- Version: 2.2.0 - From: 'Apache Software Foundation' (http://www.apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/directory-api-2.0.1/README b/doc/licenses/directory-api-2.0.1/README index 200bb050d..8125fc7e5 100644 --- a/doc/licenses/directory-api-2.0.1/README +++ b/doc/licenses/directory-api-2.0.1/README @@ -2,7 +2,7 @@ Apache Directory LDAP API (http://directory.apache.org) ------------------------------------------------------- Version: 2.0.1 - From: 'Apache Software Foundation' (http://apache.org) + From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 From 125137b76cec121eb83b088238fd9d12d0a6553a Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 27 Apr 2021 15:23:48 -0700 Subject: [PATCH 11/11] GUACAMOLE-773: Never bundle SLF4J with extensions (conflicts with webapp). --- extensions/pom.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/extensions/pom.xml b/extensions/pom.xml index d90a37080..4eac0725e 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -89,9 +89,45 @@ + + + org.apache.maven.plugins + maven-enforcer-plugin + + + never-bundle-slf4j + + + + + org.slf4j:*:*:*:compile + org.slf4j:*:*:*:runtime + + + + + + enforce + + + + + + + + + + org.slf4j + slf4j-api + provided + + + +