diff --git a/doc/licenses/apache-mina-2.2.1/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.1/dep-coordinates.txt deleted file mode 100644 index f6881854c..000000000 --- a/doc/licenses/apache-mina-2.2.1/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.mina:mina-core:jar:2.2.1 diff --git a/doc/licenses/apache-mina-2.2.1/NOTICE b/doc/licenses/apache-mina-2.2.2/NOTICE similarity index 68% rename from doc/licenses/apache-mina-2.2.1/NOTICE rename to doc/licenses/apache-mina-2.2.2/NOTICE index 893531138..8bbb45551 100644 --- a/doc/licenses/apache-mina-2.2.1/NOTICE +++ b/doc/licenses/apache-mina-2.2.2/NOTICE @@ -1,5 +1,5 @@ Apache MINA -Copyright 2007-2016 The Apache Software Foundation. +Copyright 2007-2023 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/doc/licenses/apache-mina-2.2.1/README b/doc/licenses/apache-mina-2.2.2/README similarity index 90% rename from doc/licenses/apache-mina-2.2.1/README rename to doc/licenses/apache-mina-2.2.2/README index afb3c91c7..8fea0f1e9 100644 --- a/doc/licenses/apache-mina-2.2.1/README +++ b/doc/licenses/apache-mina-2.2.2/README @@ -1,7 +1,7 @@ Apache Mina (https://mina.apache.org/) -------------------------------------- - Version: 2.2.1 + Version: 2.2.2 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt new file mode 100644 index 000000000..5bf57abcf --- /dev/null +++ b/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.mina:mina-core:jar:2.2.2 diff --git a/doc/licenses/bouncycastle-fips-1.0.2.3/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-1.0.2.3/dep-coordinates.txt deleted file mode 100644 index b5c076437..000000000 --- a/doc/licenses/bouncycastle-fips-1.0.2.3/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.bouncycastle:bc-fips:jar:1.0.2.3 diff --git a/doc/licenses/bouncycastle-fips-1.0.2.3/LICENSE b/doc/licenses/bouncycastle-fips-1.0.2.4/LICENSE similarity index 60% rename from doc/licenses/bouncycastle-fips-1.0.2.3/LICENSE rename to doc/licenses/bouncycastle-fips-1.0.2.4/LICENSE index a02bc176b..613014285 100644 --- a/doc/licenses/bouncycastle-fips-1.0.2.3/LICENSE +++ b/doc/licenses/bouncycastle-fips-1.0.2.4/LICENSE @@ -1,12 +1,12 @@ -Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc. +Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc. (https://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: +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. @@ -17,4 +17,4 @@ 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. +SOFTWARE. diff --git a/doc/licenses/bouncycastle-fips-1.0.2.3/README b/doc/licenses/bouncycastle-fips-1.0.2.4/README similarity index 75% rename from doc/licenses/bouncycastle-fips-1.0.2.3/README rename to doc/licenses/bouncycastle-fips-1.0.2.4/README index 9813256bd..58588fe3d 100644 --- a/doc/licenses/bouncycastle-fips-1.0.2.3/README +++ b/doc/licenses/bouncycastle-fips-1.0.2.4/README @@ -1,8 +1,8 @@ BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java) ----------------------------------------------------------------------- - Version: 1.0.2.3 + Version: 1.0.2.4 From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) License(s): - MIT (bundled/bouncycastle-fips-1.0.2.3/LICENSE) + MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE) 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 new file mode 100644 index 000000000..ea08eb75c --- /dev/null +++ b/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt @@ -0,0 +1 @@ +org.bouncycastle:bc-fips:jar:1.0.2.4 diff --git a/doc/licenses/directory-api-2.1.3/NOTICE b/doc/licenses/directory-api-2.1.3/NOTICE deleted file mode 100644 index 41b0ed4e0..000000000 --- a/doc/licenses/directory-api-2.1.3/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -Apache Directory LDAP API -Copyright 2003-2022 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.1.3/dep-coordinates.txt b/doc/licenses/directory-api-2.1.3/dep-coordinates.txt deleted file mode 100644 index d2c2f9277..000000000 --- a/doc/licenses/directory-api-2.1.3/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -org.apache.directory.api:api-all:jar:2.1.3 diff --git a/doc/licenses/directory-api-2.1.4/NOTICE b/doc/licenses/directory-api-2.1.4/NOTICE new file mode 100644 index 000000000..676a182bd --- /dev/null +++ b/doc/licenses/directory-api-2.1.4/NOTICE @@ -0,0 +1,5 @@ +Apache Directory LDAP API +Copyright 2003-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/). diff --git a/doc/licenses/directory-api-2.1.3/README b/doc/licenses/directory-api-2.1.4/README similarity index 91% rename from doc/licenses/directory-api-2.1.3/README rename to doc/licenses/directory-api-2.1.4/README index 4a7d8ded3..1ceaa17b4 100644 --- a/doc/licenses/directory-api-2.1.3/README +++ b/doc/licenses/directory-api-2.1.4/README @@ -1,7 +1,7 @@ Apache Directory LDAP API (http://directory.apache.org) ------------------------------------------------------- - Version: 2.1.3 + Version: 2.1.4 From: 'Apache Software Foundation' (https://www.apache.org/) License(s): Apache v2.0 diff --git a/doc/licenses/directory-api-2.1.4/dep-coordinates.txt b/doc/licenses/directory-api-2.1.4/dep-coordinates.txt new file mode 100644 index 000000000..8d7257210 --- /dev/null +++ b/doc/licenses/directory-api-2.1.4/dep-coordinates.txt @@ -0,0 +1 @@ +org.apache.directory.api:api-all:jar:2.1.4 diff --git a/doc/licenses/guava-32.1.1-jre/README b/doc/licenses/guava-32.1.2-jre/README similarity index 90% rename from doc/licenses/guava-32.1.1-jre/README rename to doc/licenses/guava-32.1.2-jre/README index d1469033c..affd04226 100644 --- a/doc/licenses/guava-32.1.1-jre/README +++ b/doc/licenses/guava-32.1.2-jre/README @@ -1,7 +1,7 @@ Guava: Google Core Libraries for Java (https://github.com/google/guava) ----------------------------------------------------------------------- - Version: 32.1.1-jre + Version: 32.1.2-jre From: 'Google Inc.' (http://www.google.com/) License(s): Apache v2.0 diff --git a/doc/licenses/guava-32.1.1-jre/dep-coordinates.txt b/doc/licenses/guava-32.1.2-jre/dep-coordinates.txt similarity index 76% rename from doc/licenses/guava-32.1.1-jre/dep-coordinates.txt rename to doc/licenses/guava-32.1.2-jre/dep-coordinates.txt index 694242470..c71abdf25 100644 --- a/doc/licenses/guava-32.1.1-jre/dep-coordinates.txt +++ b/doc/licenses/guava-32.1.2-jre/dep-coordinates.txt @@ -1,3 +1,3 @@ com.google.guava:failureaccess:jar:1.0.1 -com.google.guava:guava:jar:32.1.1-jre +com.google.guava:guava:jar:32.1.2-jre com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava diff --git a/doc/licenses/jquery-3.6.4/dep-coordinates.txt b/doc/licenses/jquery-3.6.4/dep-coordinates.txt deleted file mode 100644 index 620a5f8b1..000000000 --- a/doc/licenses/jquery-3.6.4/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -jquery:3.6.4 diff --git a/doc/licenses/jquery-3.6.4/LICENSE.txt b/doc/licenses/jquery-3.7.1/LICENSE.txt similarity index 100% rename from doc/licenses/jquery-3.6.4/LICENSE.txt rename to doc/licenses/jquery-3.7.1/LICENSE.txt diff --git a/doc/licenses/jquery-3.6.4/README b/doc/licenses/jquery-3.7.1/README similarity index 65% rename from doc/licenses/jquery-3.6.4/README rename to doc/licenses/jquery-3.7.1/README index a15bc0976..5e5cec423 100644 --- a/doc/licenses/jquery-3.6.4/README +++ b/doc/licenses/jquery-3.7.1/README @@ -1,8 +1,8 @@ jQuery (http://jquery.com/) --------------------------- - Version: 3.6.4 + Version: 3.7.1 From: 'OpenJS Foundation' (https://openjsf.org/) License(s): - MIT (bundled/jquery-3.6.4/LICENSE.txt) + MIT (bundled/jquery-3.7.1/LICENSE.txt) diff --git a/doc/licenses/jquery-3.7.1/dep-coordinates.txt b/doc/licenses/jquery-3.7.1/dep-coordinates.txt new file mode 100644 index 000000000..12b56f771 --- /dev/null +++ b/doc/licenses/jquery-3.7.1/dep-coordinates.txt @@ -0,0 +1 @@ +jquery:3.7.1 diff --git a/doc/licenses/kotlin-1.9.0/dep-coordinates.txt b/doc/licenses/kotlin-1.9.0/dep-coordinates.txt deleted file mode 100644 index ce0ecd676..000000000 --- a/doc/licenses/kotlin-1.9.0/dep-coordinates.txt +++ /dev/null @@ -1,5 +0,0 @@ -org.jetbrains.kotlin:kotlin-reflect:jar:1.9.0 -org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.0 -org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.0 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.0 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.0 diff --git a/doc/licenses/kotlin-1.9.0/NOTICE.txt b/doc/licenses/kotlin-1.9.10/NOTICE.txt similarity index 100% rename from doc/licenses/kotlin-1.9.0/NOTICE.txt rename to doc/licenses/kotlin-1.9.10/NOTICE.txt diff --git a/doc/licenses/kotlin-1.9.0/README b/doc/licenses/kotlin-1.9.10/README similarity index 89% rename from doc/licenses/kotlin-1.9.0/README rename to doc/licenses/kotlin-1.9.10/README index 73de2f24c..f7a6a3b7a 100644 --- a/doc/licenses/kotlin-1.9.0/README +++ b/doc/licenses/kotlin-1.9.10/README @@ -1,7 +1,7 @@ Kotlin (https://kotlinlang.org/) -------------------------------- - Version: 1.9.0 + Version: 1.9.10 From: 'JetBrains s.r.o and respective authors and developers' License(s): Apache v2.0 diff --git a/doc/licenses/kotlin-1.9.10/dep-coordinates.txt b/doc/licenses/kotlin-1.9.10/dep-coordinates.txt new file mode 100644 index 000000000..90ed95929 --- /dev/null +++ b/doc/licenses/kotlin-1.9.10/dep-coordinates.txt @@ -0,0 +1,5 @@ +org.jetbrains.kotlin:kotlin-reflect:jar:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.10 diff --git a/doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt deleted file mode 100644 index 448100780..000000000 --- a/doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -com.keepersecurity.secrets-manager:core:jar:16.5.4 diff --git a/doc/licenses/ksm-sdk-16.5.4/LICENSE b/doc/licenses/ksm-sdk-16.6.2/LICENSE similarity index 100% rename from doc/licenses/ksm-sdk-16.5.4/LICENSE rename to doc/licenses/ksm-sdk-16.6.2/LICENSE diff --git a/doc/licenses/ksm-sdk-16.5.4/README b/doc/licenses/ksm-sdk-16.6.2/README similarity index 77% rename from doc/licenses/ksm-sdk-16.5.4/README rename to doc/licenses/ksm-sdk-16.6.2/README index 7aaedba80..d60941712 100644 --- a/doc/licenses/ksm-sdk-16.5.4/README +++ b/doc/licenses/ksm-sdk-16.6.2/README @@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK (https://github.com/Keeper-Security/secrets-manager) ---------------------------------------------------- - Version: 16.5.4 + Version: 16.6.2 From: 'Keeper Security' (https://www.keepersecurity.com/) License(s): - MIT (bundled/ksm-sdk-16.5.4/LICENSE) + MIT (bundled/ksm-sdk-16.6.2/LICENSE) diff --git a/doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt new file mode 100644 index 000000000..f5db74eaf --- /dev/null +++ b/doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt @@ -0,0 +1 @@ +com.keepersecurity.secrets-manager:core:jar:16.6.2 diff --git a/doc/licenses/logback-1.3.8/LICENSE.txt b/doc/licenses/logback-1.3.11/LICENSE.txt similarity index 100% rename from doc/licenses/logback-1.3.8/LICENSE.txt rename to doc/licenses/logback-1.3.11/LICENSE.txt diff --git a/doc/licenses/logback-1.3.8/README b/doc/licenses/logback-1.3.11/README similarity index 63% rename from doc/licenses/logback-1.3.8/README rename to doc/licenses/logback-1.3.11/README index fd0d8947a..a81bdedaf 100644 --- a/doc/licenses/logback-1.3.8/README +++ b/doc/licenses/logback-1.3.11/README @@ -1,8 +1,8 @@ Logback (http://logback.qos.ch/) -------------------------------- - Version: 1.3.8 + Version: 1.3.11 From: 'QOS.ch Sàrl' (http://qos.ch/) License(s): - EPL v1.0 (bundled/logback-1.3.8/LICENSE.txt) + EPL v1.0 (bundled/logback-1.3.11/LICENSE.txt) diff --git a/doc/licenses/logback-1.3.11/dep-coordinates.txt b/doc/licenses/logback-1.3.11/dep-coordinates.txt new file mode 100644 index 000000000..be16de903 --- /dev/null +++ b/doc/licenses/logback-1.3.11/dep-coordinates.txt @@ -0,0 +1,2 @@ +ch.qos.logback:logback-classic:jar:1.3.11 +ch.qos.logback:logback-core:jar:1.3.11 diff --git a/doc/licenses/logback-1.3.8/dep-coordinates.txt b/doc/licenses/logback-1.3.8/dep-coordinates.txt deleted file mode 100644 index bbc410bb6..000000000 --- a/doc/licenses/logback-1.3.8/dep-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -ch.qos.logback:logback-classic:jar:1.3.8 -ch.qos.logback:logback-core:jar:1.3.8 diff --git a/doc/licenses/slf4j-api-2.0.7/dep-coordinates.txt b/doc/licenses/slf4j-api-2.0.7/dep-coordinates.txt deleted file mode 100644 index 9de74e635..000000000 --- a/doc/licenses/slf4j-api-2.0.7/dep-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -org.slf4j:jul-to-slf4j:jar:2.0.7 -org.slf4j:slf4j-api:jar:2.0.7 diff --git a/doc/licenses/slf4j-api-2.0.7/LICENSE.txt b/doc/licenses/slf4j-api-2.0.9/LICENSE.txt similarity index 100% rename from doc/licenses/slf4j-api-2.0.7/LICENSE.txt rename to doc/licenses/slf4j-api-2.0.9/LICENSE.txt diff --git a/doc/licenses/slf4j-api-2.0.7/README b/doc/licenses/slf4j-api-2.0.9/README similarity index 70% rename from doc/licenses/slf4j-api-2.0.7/README rename to doc/licenses/slf4j-api-2.0.9/README index 2fbef08ed..9520f4d84 100644 --- a/doc/licenses/slf4j-api-2.0.7/README +++ b/doc/licenses/slf4j-api-2.0.9/README @@ -1,8 +1,8 @@ Simple Logging Facade for Java (http://slf4j.org/) -------------------------------------------------- - Version: 2.0.7 + Version: 2.0.9 From: 'QOS.ch Sàrl' (http://qos.ch/) License(s): - MIT (bundled/slf4j-api-2.0.7/LICENSE.txt) + MIT (bundled/slf4j-api-2.0.9/LICENSE.txt) diff --git a/doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt b/doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt new file mode 100644 index 000000000..d4db9dd7e --- /dev/null +++ b/doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt @@ -0,0 +1,2 @@ +org.slf4j:jul-to-slf4j:jar:2.0.9 +org.slf4j:slf4j-api:jar:2.0.9 diff --git a/doc/licenses/webpack-4.46.0/dep-coordinates.txt b/doc/licenses/webpack-4.46.0/dep-coordinates.txt deleted file mode 100644 index bc6b6d1cb..000000000 --- a/doc/licenses/webpack-4.46.0/dep-coordinates.txt +++ /dev/null @@ -1 +0,0 @@ -webpack:4.46.0 diff --git a/doc/licenses/webpack-4.46.0/LICENSE b/doc/licenses/webpack-4.47.0/LICENSE similarity index 100% rename from doc/licenses/webpack-4.46.0/LICENSE rename to doc/licenses/webpack-4.47.0/LICENSE diff --git a/doc/licenses/webpack-4.46.0/README b/doc/licenses/webpack-4.47.0/README similarity index 67% rename from doc/licenses/webpack-4.46.0/README rename to doc/licenses/webpack-4.47.0/README index 0e4043b5d..1420e33ba 100644 --- a/doc/licenses/webpack-4.46.0/README +++ b/doc/licenses/webpack-4.47.0/README @@ -1,8 +1,8 @@ Webpack (https://webpack.js.org/) --------------------------------- - Version: 4.46.0 + Version: 4.47.0 From: 'JS Foundation and other contributors' License(s): - MIT (bundled/webpack-4.46.0/LICENSE) + MIT (bundled/webpack-4.47.0/LICENSE) diff --git a/doc/licenses/webpack-4.47.0/dep-coordinates.txt b/doc/licenses/webpack-4.47.0/dep-coordinates.txt new file mode 100644 index 000000000..59c0515b0 --- /dev/null +++ b/doc/licenses/webpack-4.47.0/dep-coordinates.txt @@ -0,0 +1 @@ +webpack:4.47.0 diff --git a/doc/licenses/zxing-3.5.1/dep-coordinates.txt b/doc/licenses/zxing-3.5.1/dep-coordinates.txt deleted file mode 100644 index 32b7d96b1..000000000 --- a/doc/licenses/zxing-3.5.1/dep-coordinates.txt +++ /dev/null @@ -1,2 +0,0 @@ -com.google.zxing:core:jar:3.5.1 -com.google.zxing:javase:jar:3.5.1 diff --git a/doc/licenses/zxing-3.5.1/AUTHORS b/doc/licenses/zxing-3.5.2/AUTHORS similarity index 100% rename from doc/licenses/zxing-3.5.1/AUTHORS rename to doc/licenses/zxing-3.5.2/AUTHORS diff --git a/doc/licenses/zxing-3.5.1/NOTICE b/doc/licenses/zxing-3.5.2/NOTICE similarity index 100% rename from doc/licenses/zxing-3.5.1/NOTICE rename to doc/licenses/zxing-3.5.2/NOTICE diff --git a/doc/licenses/zxing-3.5.1/README b/doc/licenses/zxing-3.5.2/README similarity index 85% rename from doc/licenses/zxing-3.5.1/README rename to doc/licenses/zxing-3.5.2/README index ee6e02c95..a05aeaf8c 100644 --- a/doc/licenses/zxing-3.5.1/README +++ b/doc/licenses/zxing-3.5.2/README @@ -1,8 +1,8 @@ ZXing Barcode Scanning Library (https://github.com/zxing/zxing/) ---------------------------------------------------------------- - Version: 3.5.1 - From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.1/AUTHORS) + Version: 3.5.2 + From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.2/AUTHORS) License(s): Apache v2.0 diff --git a/doc/licenses/zxing-3.5.2/dep-coordinates.txt b/doc/licenses/zxing-3.5.2/dep-coordinates.txt new file mode 100644 index 000000000..041989d7d --- /dev/null +++ b/doc/licenses/zxing-3.5.2/dep-coordinates.txt @@ -0,0 +1,2 @@ +com.google.zxing:core:jar:3.5.2 +com.google.zxing:javase:jar:3.5.2 diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 9a492c0d6..cd3bd5b4d 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.1.3 + 2.1.4 diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml index 9d041e3f9..019b810f2 100644 --- a/extensions/guacamole-auth-totp/pom.xml +++ b/extensions/guacamole-auth-totp/pom.xml @@ -162,12 +162,12 @@ com.google.zxing javase - 3.5.1 + 3.5.2 com.google.zxing core - 3.5.1 + 3.5.2 diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml index 3ddba9cf6..e67bc6331 100644 --- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml +++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml @@ -38,7 +38,7 @@ - 1.9.0 + 1.9.10 @@ -60,7 +60,7 @@ com.keepersecurity.secrets-manager core - 16.5.4 + 16.6.2 @@ -106,7 +106,7 @@ org.bouncycastle bc-fips - 1.0.2.3 + 1.0.2.4 diff --git a/guacamole/pom.xml b/guacamole/pom.xml index 0911ea527..f411da654 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -68,6 +68,13 @@ src/main/frontend ${project.build.directory} + + + + --openssl-legacy-provider + + @@ -76,7 +83,8 @@ install-node-and-npm - v14.16.0 + v18.18.0 + 9.8.1 diff --git a/guacamole/src/main/frontend/package-lock.json b/guacamole/src/main/frontend/package-lock.json index a9f041274..671f31124 100644 --- a/guacamole/src/main/frontend/package-lock.json +++ b/guacamole/src/main/frontend/package-lock.json @@ -12,10 +12,10 @@ "angular-translate": "^2.19.0", "angular-translate-interpolation-messageformat": "^2.19.0", "angular-translate-loader-static-files": "^2.19.0", - "blob-polyfill": "^7.0.20220408", + "blob-polyfill": ">=7.0.20220408", "datalist-polyfill": "^1.25.1", "file-saver": "^2.0.5", - "jquery": "^3.6.4", + "jquery": "^3.7.1", "jstz": "^2.1.1", "lodash": "^4.17.21" }, @@ -30,7 +30,7 @@ "google-closure-compiler": "20221004.0.0", "html-webpack-plugin": "^4.5.2", "mini-css-extract-plugin": "^1.6.2", - "webpack": "^4.46.0", + "webpack": "^4.47.0", "webpack-cli": "^4.10.0" } }, @@ -2255,9 +2255,9 @@ } }, "node_modules/css-minimizer-webpack-plugin/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -4642,9 +4642,9 @@ } }, "node_modules/jquery": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", - "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "node_modules/js-yaml": { "version": "3.14.1", @@ -4809,9 +4809,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -5803,9 +5803,9 @@ } }, "node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ { @@ -5815,10 +5815,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -7442,9 +7446,9 @@ } }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -8910,9 +8914,9 @@ } }, "node_modules/webpack": { - "version": "4.46.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", - "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", + "version": "4.47.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz", + "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==", "dependencies": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0", @@ -10930,9 +10934,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "serialize-javascript": { @@ -12731,9 +12735,9 @@ } }, "jquery": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", - "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "js-yaml": { "version": "3.14.1", @@ -12868,9 +12872,9 @@ }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" } } }, @@ -13661,12 +13665,12 @@ "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==" }, "postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -14976,9 +14980,9 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -16179,9 +16183,9 @@ } }, "webpack": { - "version": "4.46.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", - "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", + "version": "4.47.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz", + "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==", "requires": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0", diff --git a/guacamole/src/main/frontend/package.json b/guacamole/src/main/frontend/package.json index cb4982da0..2bd72e04e 100644 --- a/guacamole/src/main/frontend/package.json +++ b/guacamole/src/main/frontend/package.json @@ -14,7 +14,7 @@ "blob-polyfill": ">=7.0.20220408", "datalist-polyfill": "^1.25.1", "file-saver": "^2.0.5", - "jquery": "^3.6.4", + "jquery": "^3.7.1", "jstz": "^2.1.1", "lodash": "^4.17.21" }, @@ -29,7 +29,7 @@ "google-closure-compiler": "20221004.0.0", "html-webpack-plugin": "^4.5.2", "mini-css-extract-plugin": "^1.6.2", - "webpack": "^4.46.0", + "webpack": "^4.47.0", "webpack-cli": "^4.10.0" } } diff --git a/guacamole/src/main/frontend/plugins/dependency-list-plugin.js b/guacamole/src/main/frontend/plugins/dependency-list-plugin.js index 3fd62caaf..2dfaa0061 100644 --- a/guacamole/src/main/frontend/plugins/dependency-list-plugin.js +++ b/guacamole/src/main/frontend/plugins/dependency-list-plugin.js @@ -91,6 +91,13 @@ class DependencyListPlugin { */ const logger = compiler.getInfrastructureLogger(PLUGIN_NAME); + /** + * The directory receiving the dependency list file. + * + * @type {string} + */ + const outputPath = this.options.path || compiler.options.output.path; + /** * The full path to the output file that should contain the list of * discovered NPM module dependencies. @@ -98,7 +105,7 @@ class DependencyListPlugin { * @type {string} */ const outputFile = path.join( - this.options.path || compiler.options.output.path, + outputPath, this.options.filename || 'npm-dependencies.txt' ); @@ -132,6 +139,10 @@ class DependencyListPlugin { }); + // Create output path if it doesn't yet exist + if (!fs.existsSync(outputPath)) + fs.mkdirSync(outputPath, { recursive: true, mode: 0o755 }); + // Write all discovered NPM packages to configured output file const sortedCoords = Object.keys(moduleCoords).sort(); fs.writeFileSync(outputFile, sortedCoords.join('\n') + '\n'); diff --git a/guacamole/util/run-npm.sh b/guacamole/util/run-npm.sh new file mode 100755 index 000000000..6b688f089 --- /dev/null +++ b/guacamole/util/run-npm.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# +# run-npm.sh - Convenience script for automatically running the version of NPM +# used by the "guacamole" build. All command-line options given to this script +# are passed directly to NPM. The Guacamole build must have run at least once, +# even unsuccessfully, for copies of Node.js and NPM to have been downloaded. +# + +## +## The directory containing this script. +## +UTIL_DIR="`dirname "$0"`" + +## +## The directory containing the "guacamole" project. +## +PROJECT_DIR="$UTIL_DIR/.." + +## +## The directory containing copies of Node.js and NPM that were downloaded by +## the "guacamole" project build process. +## +NODE_DIR="$PROJECT_DIR/target/node" + +# Invoke NPM with provided arguments, using the Node.js and NPM versions +# downloaded by the "guacamole" project build +exec "$NODE_DIR/node" "$NODE_DIR/node_modules/npm/bin/npm-cli.js" "$@" + diff --git a/pom.xml b/pom.xml index 36677bcd8..98f16a2e2 100644 --- a/pom.xml +++ b/pom.xml @@ -36,16 +36,16 @@ UTF-8 - 32.1.1-jre + 32.1.2-jre 5.1.0 2.6.1 2.15.2 2.15.2 2.40 - 5.9.3 + 5.10.0 4.13.2 - 1.3.8 - 2.0.7 + 1.3.11 + 2.0.9 @@ -512,7 +512,7 @@ regex - .+-(alpha|beta)\b.*? + .+-(alpha|Alpha|beta|Beta)[0-9]*\b.*?