From 429d96888e10ba5ab19bdca6d513c28b11a8e1d9 Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Tue, 4 Jun 2024 00:12:27 +0000 Subject: [PATCH] GUACAMOLE-1956: Update maven dependencies to latest compatible versions. --- doc/guacamole-example/pom.xml | 2 +- .../apache-commons-1.16.1/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../apache-commons-1.17.0/dep-coordinates.txt | 1 + .../bouncycastle-fips-1.0.2.4/dep-coordinates.txt | 1 - .../LICENSE | 0 .../README | 4 ++-- .../bouncycastle-fips-1.0.2.5/dep-coordinates.txt | 1 + doc/licenses/jakarta-validation-api-2.1.3/NOTICE | 11 +++++++++++ doc/licenses/jakarta-validation-api-2.1.3/README | 8 ++++++++ .../jakarta-validation-api-2.1.3/dep-coordinates.txt | 1 + .../kotlinx-serialization-1.6.0/dep-coordinates.txt | 2 -- .../NOTICE.txt | 0 .../README | 2 +- .../kotlinx-serialization-1.6.3/dep-coordinates.txt | 2 ++ doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt | 1 - .../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/LICENSE | 0 .../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/README | 4 ++-- doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt | 1 + doc/licenses/mybatis-3.5.15/dep-coordinates.txt | 1 - .../{mybatis-3.5.15 => mybatis-3.5.16}/NOTICE | 0 .../{mybatis-3.5.15 => mybatis-3.5.16}/README | 2 +- doc/licenses/mybatis-3.5.16/dep-coordinates.txt | 1 + .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-sso-cas/pom.xml | 2 +- .../modules/guacamole-auth-sso-saml/pom.xml | 4 ++-- extensions/guacamole-auth-totp/pom.xml | 2 +- .../modules/guacamole-vault-ksm/pom.xml | 4 ++-- 29 files changed, 41 insertions(+), 21 deletions(-) delete mode 100644 doc/licenses/apache-commons-1.16.1/dep-coordinates.txt rename doc/licenses/{apache-commons-1.16.1 => apache-commons-1.17.0}/NOTICE (100%) rename doc/licenses/{apache-commons-1.16.1 => apache-commons-1.17.0}/README (92%) create mode 100644 doc/licenses/apache-commons-1.17.0/dep-coordinates.txt delete mode 100644 doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt rename doc/licenses/{bouncycastle-fips-1.0.2.4 => bouncycastle-fips-1.0.2.5}/LICENSE (100%) rename doc/licenses/{bouncycastle-fips-1.0.2.4 => bouncycastle-fips-1.0.2.5}/README (75%) create mode 100644 doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt create mode 100644 doc/licenses/jakarta-validation-api-2.1.3/NOTICE create mode 100644 doc/licenses/jakarta-validation-api-2.1.3/README create mode 100644 doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt delete mode 100644 doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt rename doc/licenses/{kotlinx-serialization-1.6.0 => kotlinx-serialization-1.6.3}/NOTICE.txt (100%) rename doc/licenses/{kotlinx-serialization-1.6.0 => kotlinx-serialization-1.6.3}/README (92%) create mode 100644 doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt delete mode 100644 doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt rename doc/licenses/{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/LICENSE (100%) rename doc/licenses/{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/README (77%) create mode 100644 doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt delete mode 100644 doc/licenses/mybatis-3.5.15/dep-coordinates.txt rename doc/licenses/{mybatis-3.5.15 => mybatis-3.5.16}/NOTICE (100%) rename doc/licenses/{mybatis-3.5.15 => mybatis-3.5.16}/README (89%) create mode 100644 doc/licenses/mybatis-3.5.16/dep-coordinates.txt diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index 1564db2d98..ec12bfbbb4 100644 --- a/doc/guacamole-example/pom.xml +++ b/doc/guacamole-example/pom.xml @@ -122,7 +122,7 @@ org.slf4j slf4j-simple - 2.0.7 + 2.0.13 diff --git a/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt b/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt deleted file mode 100644 index 88065a0198..0000000000 --- a/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -commons-codec:commons-codec:jar:1.16.1 diff --git a/doc/licenses/apache-commons-1.16.1/NOTICE b/doc/licenses/apache-commons-1.17.0/NOTICE similarity index 100% rename from doc/licenses/apache-commons-1.16.1/NOTICE rename to doc/licenses/apache-commons-1.17.0/NOTICE diff --git a/doc/licenses/apache-commons-1.16.1/README b/doc/licenses/apache-commons-1.17.0/README similarity index 92% rename from doc/licenses/apache-commons-1.16.1/README rename to doc/licenses/apache-commons-1.17.0/README index 8be57b1189..b49f7a9824 100644 --- a/doc/licenses/apache-commons-1.16.1/README +++ b/doc/licenses/apache-commons-1.17.0/README @@ -1,7 +1,7 @@ Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) ----------------------------------------------------------------------- - Version: 1.16.1 + Version: 1.17.0 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt b/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt new file mode 100644 index 0000000000..eb0a235818 --- /dev/null +++ b/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt @@ -0,0 +1 @@ +commons-codec:commons-codec:jar:1.17.0 diff --git a/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt deleted file mode 100644 index ea08eb75c8..0000000000 --- a/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.bouncycastle:bc-fips:jar:1.0.2.4 diff --git a/doc/licenses/bouncycastle-fips-1.0.2.4/LICENSE b/doc/licenses/bouncycastle-fips-1.0.2.5/LICENSE similarity index 100% rename from doc/licenses/bouncycastle-fips-1.0.2.4/LICENSE rename to doc/licenses/bouncycastle-fips-1.0.2.5/LICENSE diff --git a/doc/licenses/bouncycastle-fips-1.0.2.4/README b/doc/licenses/bouncycastle-fips-1.0.2.5/README similarity index 75% rename from doc/licenses/bouncycastle-fips-1.0.2.4/README rename to doc/licenses/bouncycastle-fips-1.0.2.5/README index 58588fe3d5..9c0b964a72 100644 --- a/doc/licenses/bouncycastle-fips-1.0.2.4/README +++ b/doc/licenses/bouncycastle-fips-1.0.2.5/README @@ -1,8 +1,8 @@ BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java) ----------------------------------------------------------------------- - Version: 1.0.2.4 + Version: 1.0.2.5 From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) License(s): - MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE) + MIT (bundled/bouncycastle-fips-1.0.2.5/LICENSE) diff --git a/doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt new file mode 100644 index 0000000000..329e02adfc --- /dev/null +++ b/doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt @@ -0,0 +1 @@ +org.bouncycastle:bc-fips:jar:1.0.2.5 diff --git a/doc/licenses/jakarta-validation-api-2.1.3/NOTICE b/doc/licenses/jakarta-validation-api-2.1.3/NOTICE new file mode 100644 index 0000000000..20468229eb --- /dev/null +++ b/doc/licenses/jakarta-validation-api-2.1.3/NOTICE @@ -0,0 +1,11 @@ +# Notices for Eclipse Jakarta Bean Validation + +This content is produced and maintained by the Eclipse Jakarta Bean Validation +project. + +* Project home: https://projects.eclipse.org/projects/ee4j.bean-validation + +## Trademarks + + Jakarta Bean Validation is a trademark of the Eclipse Foundation. + diff --git a/doc/licenses/jakarta-validation-api-2.1.3/README b/doc/licenses/jakarta-validation-api-2.1.3/README new file mode 100644 index 0000000000..ed6d5b9101 --- /dev/null +++ b/doc/licenses/jakarta-validation-api-2.1.3/README @@ -0,0 +1,8 @@ +Jakarta Bean Validation API (https://beanvalidation.org/) +--------------------------------------------------------- + + Version: 2.1.3 + From: 'Red Hat Inc.' (https://www.redhat.com/) + License(s): + Apache v2.0 + diff --git a/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt b/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt new file mode 100644 index 0000000000..b112b9d9c2 --- /dev/null +++ b/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt @@ -0,0 +1 @@ +jakarta.validation:jakarta.validation-api:jar:2.1.3 diff --git a/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt b/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt deleted file mode 100644 index f4606d4a05..0000000000 --- a/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.0 -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.0 diff --git a/doc/licenses/kotlinx-serialization-1.6.0/NOTICE.txt b/doc/licenses/kotlinx-serialization-1.6.3/NOTICE.txt similarity index 100% rename from doc/licenses/kotlinx-serialization-1.6.0/NOTICE.txt rename to doc/licenses/kotlinx-serialization-1.6.3/NOTICE.txt diff --git a/doc/licenses/kotlinx-serialization-1.6.0/README b/doc/licenses/kotlinx-serialization-1.6.3/README similarity index 92% rename from doc/licenses/kotlinx-serialization-1.6.0/README rename to doc/licenses/kotlinx-serialization-1.6.3/README index a9f6faa896..e4c9606801 100644 --- a/doc/licenses/kotlinx-serialization-1.6.0/README +++ b/doc/licenses/kotlinx-serialization-1.6.3/README @@ -1,7 +1,7 @@ Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization) ---------------------------------------------------------------------- - Version: 1.6.0 + Version: 1.6.3 From: 'JetBrains s.r.o and respective authors and developers' License(s): Apache v2.0 diff --git a/doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt b/doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt new file mode 100644 index 0000000000..6c3294d486 --- /dev/null +++ b/doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt @@ -0,0 +1,2 @@ +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.3 +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.3 diff --git a/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt deleted file mode 100644 index d5198ae096..0000000000 --- a/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.keepersecurity.secrets-manager:core:jar:16.6.3 diff --git a/doc/licenses/ksm-sdk-16.6.3/LICENSE b/doc/licenses/ksm-sdk-16.6.4/LICENSE similarity index 100% rename from doc/licenses/ksm-sdk-16.6.3/LICENSE rename to doc/licenses/ksm-sdk-16.6.4/LICENSE diff --git a/doc/licenses/ksm-sdk-16.6.3/README b/doc/licenses/ksm-sdk-16.6.4/README similarity index 77% rename from doc/licenses/ksm-sdk-16.6.3/README rename to doc/licenses/ksm-sdk-16.6.4/README index 2b43640306..d3edfcbd58 100644 --- a/doc/licenses/ksm-sdk-16.6.3/README +++ b/doc/licenses/ksm-sdk-16.6.4/README @@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK (https://github.com/Keeper-Security/secrets-manager) ---------------------------------------------------- - Version: 16.6.3 + Version: 16.6.4 From: 'Keeper Security' (https://www.keepersecurity.com/) License(s): - MIT (bundled/ksm-sdk-16.6.3/LICENSE) + MIT (bundled/ksm-sdk-16.6.4/LICENSE) diff --git a/doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt new file mode 100644 index 0000000000..50d572d79c --- /dev/null +++ b/doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt @@ -0,0 +1 @@ +com.keepersecurity.secrets-manager:core:jar:16.6.4 diff --git a/doc/licenses/mybatis-3.5.15/dep-coordinates.txt b/doc/licenses/mybatis-3.5.15/dep-coordinates.txt deleted file mode 100644 index 0236032eb1..0000000000 --- a/doc/licenses/mybatis-3.5.15/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.mybatis:mybatis:jar:3.5.15 diff --git a/doc/licenses/mybatis-3.5.15/NOTICE b/doc/licenses/mybatis-3.5.16/NOTICE similarity index 100% rename from doc/licenses/mybatis-3.5.15/NOTICE rename to doc/licenses/mybatis-3.5.16/NOTICE diff --git a/doc/licenses/mybatis-3.5.15/README b/doc/licenses/mybatis-3.5.16/README similarity index 89% rename from doc/licenses/mybatis-3.5.15/README rename to doc/licenses/mybatis-3.5.16/README index f082c3a111..d47358eea3 100644 --- a/doc/licenses/mybatis-3.5.15/README +++ b/doc/licenses/mybatis-3.5.16/README @@ -1,7 +1,7 @@ MyBatis (http://www.mybatis.org/mybatis-3/) ------------------------------------------- - Version: 3.5.15 + Version: 3.5.16 From: 'MyBatis' (http://www.mybatis.org/) License(s): Apache v2.0 diff --git a/doc/licenses/mybatis-3.5.16/dep-coordinates.txt b/doc/licenses/mybatis-3.5.16/dep-coordinates.txt new file mode 100644 index 0000000000..1a7739c8bb --- /dev/null +++ b/doc/licenses/mybatis-3.5.16/dep-coordinates.txt @@ -0,0 +1 @@ +org.mybatis:mybatis:jar:3.5.16 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 bc2220380d..ae0eacce1d 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,7 +57,7 @@ org.mybatis mybatis - 3.5.15 + 3.5.16 diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml index b242400e3a..381f9ebdbf 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml @@ -133,7 +133,7 @@ commons-codec commons-codec - 1.16.1 + 1.17.0 diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml index 4bd79c7515..234395c475 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml @@ -135,7 +135,7 @@ @@ -157,7 +157,7 @@ commons-codec commons-codec - 1.16.1 + 1.17.0 diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml index 794fc08736..36279940f3 100644 --- a/extensions/guacamole-auth-totp/pom.xml +++ b/extensions/guacamole-auth-totp/pom.xml @@ -174,7 +174,7 @@ javax.ws.rs javax.ws.rs-api - 2.0 + 2.1.1 provided diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml index 31142d8ae8..233b62136f 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml @@ -60,7 +60,7 @@ com.keepersecurity.secrets-manager core - 16.6.3 + 16.6.4 @@ -106,7 +106,7 @@ org.bouncycastle bc-fips - 1.0.2.4 + 1.0.2.5