Merge 1.5.5 changes back to main.

2025-10-31 00:53:21 +00:00 · 2024-03-09 15:05:19 -05:00
parent c257a57e4c bdfe030f61
commit 5843c67704
81 changed files with 145 additions and 101 deletions
--- a/4
+++ b/4
@@ -52,8 +52,8 @@ ARG MAVEN_ARGUMENTS="-DskipTests=false"

 # Versions of JDBC drivers to bundle within image
 ARG MSSQL_JDBC_VERSION=9.4.1
-ARG MYSQL_JDBC_VERSION=8.0.33
-ARG PGSQL_JDBC_VERSION=42.6.0
+ARG MYSQL_JDBC_VERSION=8.3.0
+ARG PGSQL_JDBC_VERSION=42.7.2

 # Build environment variables
 ENV \
--- a/doc/licenses/angular-translate-2.19.0/dep-coordinates.txt
+++ b/doc/licenses/angular-translate-2.19.0/dep-coordinates.txt
@@ -1,3 +0,0 @@
-angular-translate-interpolation-messageformat:2.19.0
-angular-translate-loader-static-files:2.19.0
-angular-translate:2.19.0
--- a/doc/licenses/angular-translate-2.19.1/LICENSE
+++ b/doc/licenses/angular-translate-2.19.1/LICENSE
--- a/doc/licenses/angular-translate-2.19.1/README
+++ b/doc/licenses/angular-translate-2.19.1/README
@@ -1,8 +1,8 @@
 angular-translate (https://angular-translate.github.io/)
 --------------------------------------------------------

-    Version: 2.19.0
+    Version: 2.19.1
    From: 'Pascal Precht' (https://github.com/PascalPrecht)
    License(s):
-        MIT (bundled/angular-translate-2.19.0/LICENSE)
+        MIT (bundled/angular-translate-2.19.1/LICENSE)

--- a/doc/licenses/angular-translate-2.19.1/dep-coordinates.txt
+++ b/doc/licenses/angular-translate-2.19.1/dep-coordinates.txt
@@ -0,0 +1,3 @@
+angular-translate-interpolation-messageformat:2.19.1
+angular-translate-loader-static-files:2.19.1
+angular-translate:2.19.1
--- a/doc/licenses/apache-commons-1.16.1/NOTICE
+++ b/doc/licenses/apache-commons-1.16.1/NOTICE
@@ -0,0 +1,5 @@
+Apache Commons Codec
+Copyright 2002-2024 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
--- a/doc/licenses/apache-commons-1.16.1/README
+++ b/doc/licenses/apache-commons-1.16.1/README
@@ -0,0 +1,8 @@
+Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
+-----------------------------------------------------------------------
+
+    Version: 1.16.1
+    From: 'Apache Software Foundation' (https://www.apache.org/)
+    License(s):
+        Apache v2.0
+
--- a/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
+++ b/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-codec:commons-codec:jar:1.16.1
--- a/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt
+++ b/doc/licenses/apache-commons-text-1.10.0/dep-coordinates.txt
@@ -1 +0,0 @@
-org.apache.commons:commons-text:jar:1.10.0
--- a/doc/licenses/apache-commons-text-1.11.0/NOTICE.txt
+++ b/doc/licenses/apache-commons-text-1.11.0/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons Text
-Copyright 2014-2022 The Apache Software Foundation
+Copyright 2014-2023 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
--- a/doc/licenses/apache-commons-text-1.11.0/README
+++ b/doc/licenses/apache-commons-text-1.11.0/README
@@ -1,7 +1,7 @@
 Apache Commons Text (https://commons.apache.org/proper/commons-text/)
 ---------------------------------------------------------------------

-    Version: 1.10.0
+    Version: 1.11.0
    From: 'Apache Software Foundation' (https://www.apache.org/)
    License(s):
        Apache v2.0
--- a/doc/licenses/apache-commons-text-1.11.0/dep-coordinates.txt
+++ b/doc/licenses/apache-commons-text-1.11.0/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.commons:commons-text:jar:1.11.0
--- a/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
+++ b/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
@@ -1 +0,0 @@
-org.apache.santuario:xmlsec:jar:2.2.6
--- a/doc/licenses/apache-santuario-2.3.4/NOTICE
+++ b/doc/licenses/apache-santuario-2.3.4/NOTICE
@@ -1,5 +1,5 @@
 Apache Santuario - XML Security for Java
-Copyright 1999-2022 The Apache Software Foundation
+Copyright 1999-2024 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
--- a/doc/licenses/apache-santuario-2.3.4/README
+++ b/doc/licenses/apache-santuario-2.3.4/README
@@ -1,7 +1,7 @@
 Apache Santuario (https://santuario.apache.org/)
 -------------------------------------------------

-    Version: 2.2.6
+    Version: 2.3.4
    From: 'Apache Software Foundation' (https://www.apache.org/)
    License(s):
        Apache v2.0
--- a/doc/licenses/apache-santuario-2.3.4/dep-coordinates.txt
+++ b/doc/licenses/apache-santuario-2.3.4/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.santuario:xmlsec:jar:2.3.4
--- a/doc/licenses/directory-api-2.1.5/dep-coordinates.txt
+++ b/doc/licenses/directory-api-2.1.5/dep-coordinates.txt
@@ -1 +0,0 @@
-org.apache.directory.api:api-all:jar:2.1.5
--- a/doc/licenses/directory-api-2.1.6/NOTICE
+++ b/doc/licenses/directory-api-2.1.6/NOTICE
--- a/doc/licenses/directory-api-2.1.6/README
+++ b/doc/licenses/directory-api-2.1.6/README
@@ -1,7 +1,7 @@
 Apache Directory LDAP API (http://directory.apache.org)
 -------------------------------------------------------

-    Version: 2.1.5
+    Version: 2.1.6
    From: 'Apache Software Foundation' (https://www.apache.org/)
    License(s):
        Apache v2.0
--- a/doc/licenses/directory-api-2.1.6/dep-coordinates.txt
+++ b/doc/licenses/directory-api-2.1.6/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.directory.api:api-all:jar:2.1.6
--- a/doc/licenses/ipaddress-5.4.0/dep-coordinates.txt
+++ b/doc/licenses/ipaddress-5.4.0/dep-coordinates.txt
@@ -1 +0,0 @@
-com.github.seancfoley:ipaddress:jar:5.4.0
--- a/doc/licenses/ipaddress-5.5.0/README
+++ b/doc/licenses/ipaddress-5.5.0/README
@@ -1,7 +1,7 @@
 IPAddress (https://seancfoley.github.io/IPAddress/)
 ---------------------------------------------------

-    Version: 5.4.0
+    Version: 5.5.0
    From: 'Sean C Foley' (https://seancfoley.github.io/)
    License(s):
        Apache v2.0
--- a/doc/licenses/ipaddress-5.5.0/dep-coordinates.txt
+++ b/doc/licenses/ipaddress-5.5.0/dep-coordinates.txt
@@ -0,0 +1 @@
+com.github.seancfoley:ipaddress:jar:5.5.0
--- a/doc/licenses/jackson-2.16.1/NOTICE
+++ b/doc/licenses/jackson-2.16.1/NOTICE
--- a/doc/licenses/jackson-2.16.1/README
+++ b/doc/licenses/jackson-2.16.1/README
@@ -1,7 +1,7 @@
 Jackson (https://github.com/FasterXML/jackson)
 ----------------------------------------------

-    Version: 2.16.0
+    Version: 2.16.1
    From: 'FasterXML, LLC' (https://github.com/FasterXML)
    License(s):
        Apache v2.0
--- a/doc/licenses/jackson-2.16.1/dep-coordinates.txt
+++ b/doc/licenses/jackson-2.16.1/dep-coordinates.txt
@@ -1,4 +1,4 @@
-com.fasterxml.jackson.core:jackson-core:jar:2.16.0
-com.fasterxml.jackson.core:jackson-annotations:jar:2.16.0
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.16.0
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.0
+com.fasterxml.jackson.core:jackson-core:jar:2.16.1
+com.fasterxml.jackson.core:jackson-annotations:jar:2.16.1
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.16.1
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.1
--- a/doc/licenses/jackson-databind-2.16.0/dep-coordinates.txt
+++ b/doc/licenses/jackson-databind-2.16.0/dep-coordinates.txt
@@ -1 +0,0 @@
-com.fasterxml.jackson.core:jackson-databind:jar:2.16.0
--- a/doc/licenses/jackson-databind-2.16.1/NOTICE
+++ b/doc/licenses/jackson-databind-2.16.1/NOTICE
--- a/doc/licenses/jackson-databind-2.16.1/README
+++ b/doc/licenses/jackson-databind-2.16.1/README
@@ -1,7 +1,7 @@
 Jackson-databind (https://github.com/FasterXML/jackson-databind)
 ----------------------------------------------

-    Version: 2.16.0
+    Version: 2.16.1
    From: 'FasterXML, LLC' (https://github.com/FasterXML)
    License(s):
        Apache v2.0
--- a/doc/licenses/jackson-databind-2.16.1/dep-coordinates.txt
+++ b/doc/licenses/jackson-databind-2.16.1/dep-coordinates.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core:jackson-databind:jar:2.16.1
--- a/doc/licenses/jose4j-0.9.3/dep-coordinates.txt
+++ b/doc/licenses/jose4j-0.9.3/dep-coordinates.txt
@@ -1 +0,0 @@
-org.bitbucket.b_c:jose4j:jar:0.9.3
--- a/doc/licenses/jose4j-0.9.5/NOTICE
+++ b/doc/licenses/jose4j-0.9.5/NOTICE
@@ -1,5 +1,5 @@
 jose4j
-Copyright 2012-2015 Brian Campbell
+Copyright 2012-2024 Brian Campbell

 EcdsaUsingShaAlgorithm contains code for converting the concatenated
 R & S values of the signature to and from DER, which was originally
--- a/doc/licenses/jose4j-0.9.5/README
+++ b/doc/licenses/jose4j-0.9.5/README
@@ -1,7 +1,7 @@
 jose.4.j (https://bitbucket.org/b_c/jose4j/)
 --------------------------------------------

-    Version: 0.9.3
+    Version: 0.9.5
    From: 'Brian Campbell' (https://bitbucket.org/b_c/)
    License(s):
        Apache v2.0
--- a/doc/licenses/jose4j-0.9.5/dep-coordinates.txt
+++ b/doc/licenses/jose4j-0.9.5/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bitbucket.b_c:jose4j:jar:0.9.5
--- a/doc/licenses/kotlin-1.9.21/dep-coordinates.txt
+++ b/doc/licenses/kotlin-1.9.21/dep-coordinates.txt
@@ -1,5 +0,0 @@
-org.jetbrains.kotlin:kotlin-reflect:jar:1.9.21
-org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.21
-org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.21
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.21
--- a/doc/licenses/kotlin-1.9.22/NOTICE.txt
+++ b/doc/licenses/kotlin-1.9.22/NOTICE.txt
--- a/doc/licenses/kotlin-1.9.22/README
+++ b/doc/licenses/kotlin-1.9.22/README
@@ -1,7 +1,7 @@
 Kotlin (https://kotlinlang.org/)
 --------------------------------

-    Version: 1.9.21
+    Version: 1.9.22
    From: 'JetBrains s.r.o and respective authors and developers'
    License(s):
        Apache v2.0
--- a/doc/licenses/kotlin-1.9.22/dep-coordinates.txt
+++ b/doc/licenses/kotlin-1.9.22/dep-coordinates.txt
@@ -0,0 +1,5 @@
+org.jetbrains.kotlin:kotlin-reflect:jar:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.22
--- a/doc/licenses/kotlinx-serialization-1.3.3/NOTICE.txt
+++ b/doc/licenses/kotlinx-serialization-1.3.3/NOTICE.txt
@@ -1,2 +0,0 @@
-kotlinx.serialization library.
-Copyright 2017-2019 JetBrains s.r.o and respective authors and developers
--- a/doc/licenses/kotlinx-serialization-1.3.3/dep-coordinates.txt
+++ b/doc/licenses/kotlinx-serialization-1.3.3/dep-coordinates.txt
@@ -1,2 +0,0 @@
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.3.3
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.3.3
--- a/doc/licenses/kotlinx-serialization-1.6.0/NOTICE.txt
+++ b/doc/licenses/kotlinx-serialization-1.6.0/NOTICE.txt
@@ -0,0 +1,2 @@
+kotlinx.serialization library.
+Copyright 2017-2023 JetBrains s.r.o and respective authors and developers
--- a/doc/licenses/kotlinx-serialization-1.6.0/README
+++ b/doc/licenses/kotlinx-serialization-1.6.0/README
@@ -1,7 +1,7 @@
 Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization)
 ----------------------------------------------------------------------

-    Version: 1.3.3
+    Version: 1.6.0
    From: 'JetBrains s.r.o and respective authors and developers'
    License(s):
        Apache v2.0
--- a/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt
+++ b/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt
@@ -0,0 +1,2 @@
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.0
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.0
--- a/doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt
+++ b/doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt
@@ -1 +0,0 @@
-com.keepersecurity.secrets-manager:core:jar:16.6.2
--- a/doc/licenses/ksm-sdk-16.6.3/LICENSE
+++ b/doc/licenses/ksm-sdk-16.6.3/LICENSE
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2021 Keeper Security
+Copyright (c) 2023 Keeper Security

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/doc/licenses/ksm-sdk-16.6.3/README
+++ b/doc/licenses/ksm-sdk-16.6.3/README
@@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
 (https://github.com/Keeper-Security/secrets-manager)
 ----------------------------------------------------

-    Version: 16.6.2
+    Version: 16.6.3
    From: 'Keeper Security' (https://www.keepersecurity.com/)
    License(s):
-        MIT (bundled/ksm-sdk-16.6.2/LICENSE)
+        MIT (bundled/ksm-sdk-16.6.3/LICENSE)

--- a/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
+++ b/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
@@ -0,0 +1 @@
+com.keepersecurity.secrets-manager:core:jar:16.6.3
--- a/doc/licenses/logback-1.5.2/LICENSE.txt
+++ b/doc/licenses/logback-1.5.2/LICENSE.txt
@@ -0,0 +1,17 @@
+Logback LICENSE
+---------------
+
+Logback: the reliable, generic, fast and flexible logging framework.
+Copyright (C) 1999-2024, QOS.ch. All rights reserved.
+
+This program and the accompanying materials are dual-licensed under
+either the terms of the Eclipse Public License v1.0 as published by
+the Eclipse Foundation
+ 
+  or (per the licensee's choosing)
+ 
+under the terms of the GNU Lesser General Public License version 2.1
+as published by the Free Software Foundation.
+
+** ECLIPSE PUBLIC LICENSE v1.0 CHOSEN. **
+
--- a/doc/licenses/logback-1.5.2/README
+++ b/doc/licenses/logback-1.5.2/README
@@ -0,0 +1,8 @@
+Logback (http://logback.qos.ch/)
+--------------------------------
+
+    Version: 1.5.2
+    From: 'QOS.ch Sàrl' (http://qos.ch/)
+    License(s):
+        EPL v1.0 (bundled/logback-1.5.2/LICENSE.txt)
+
--- a/doc/licenses/logback-1.5.2/dep-coordinates.txt
+++ b/doc/licenses/logback-1.5.2/dep-coordinates.txt
@@ -0,0 +1,2 @@
+ch.qos.logback:logback-classic:jar:1.5.2
+ch.qos.logback:logback-core:jar:1.5.2
--- a/doc/licenses/mybatis-3.5.14/dep-coordinates.txt
+++ b/doc/licenses/mybatis-3.5.14/dep-coordinates.txt
@@ -1 +0,0 @@
-org.mybatis:mybatis:jar:3.5.14
--- a/doc/licenses/mybatis-3.5.15/NOTICE
+++ b/doc/licenses/mybatis-3.5.15/NOTICE
--- a/doc/licenses/mybatis-3.5.15/README
+++ b/doc/licenses/mybatis-3.5.15/README
@@ -1,7 +1,7 @@
 MyBatis (http://www.mybatis.org/mybatis-3/)
 -------------------------------------------

-    Version: 3.5.14
+    Version: 3.5.15
    From: 'MyBatis' (http://www.mybatis.org/)
    License(s):
        Apache v2.0
--- a/doc/licenses/mybatis-3.5.15/dep-coordinates.txt
+++ b/doc/licenses/mybatis-3.5.15/dep-coordinates.txt
@@ -0,0 +1 @@
+org.mybatis:mybatis:jar:3.5.15
--- a/doc/licenses/slf4j-api-2.0.12/LICENSE.txt
+++ b/doc/licenses/slf4j-api-2.0.12/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
+Copyright (c) 2004-2024 QOS.ch Sarl (Switzerland)
 All rights reserved.

 Permission is hereby granted, free  of charge, to any person obtaining
--- a/doc/licenses/slf4j-api-2.0.12/README
+++ b/doc/licenses/slf4j-api-2.0.12/README
@@ -1,8 +1,8 @@
 Simple Logging Facade for Java (http://slf4j.org/)
 --------------------------------------------------

-    Version: 2.0.9
+    Version: 2.0.12
    From: 'QOS.ch Sàrl' (http://qos.ch/)
    License(s):
-        MIT (bundled/slf4j-api-2.0.9/LICENSE.txt)
+        MIT (bundled/slf4j-api-2.0.12/LICENSE.txt)

--- a/doc/licenses/slf4j-api-2.0.12/dep-coordinates.txt
+++ b/doc/licenses/slf4j-api-2.0.12/dep-coordinates.txt
@@ -0,0 +1,2 @@
+org.slf4j:jul-to-slf4j:jar:2.0.12
+org.slf4j:slf4j-api:jar:2.0.12
--- a/doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt
+++ b/doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt
@@ -1,2 +0,0 @@
-org.slf4j:jul-to-slf4j:jar:2.0.9
-org.slf4j:slf4j-api:jar:2.0.9
--- a/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
+++ b/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
@@ -1 +0,0 @@
-com.fasterxml.woodstox:woodstox-core:jar:5.4.0
--- a/doc/licenses/woodstox-core-6.5.0/README
+++ b/doc/licenses/woodstox-core-6.5.0/README
@@ -1,7 +1,7 @@
 Woodstox Core (https://github.com/FasterXML/woodstox)
 ------------------------------------------------------

-    Version: 5.4.0
+    Version: 6.5.0
    From: 'FasterXML, LLC' (http://fasterxml.com/)
    License(s):
        Apache v2.0
--- a/doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt
+++ b/doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt
@@ -0,0 +1 @@
+com.fasterxml.woodstox:woodstox-core:jar:6.5.0
--- a/doc/licenses/woodstox-stax2-api-4.2.1/LICENSE
+++ b/doc/licenses/woodstox-stax2-api-4.2.1/LICENSE
--- a/doc/licenses/woodstox-stax2-api-4.2.1/README
+++ b/doc/licenses/woodstox-stax2-api-4.2.1/README
@@ -1,8 +1,8 @@
 Woodstox Stax2-API (https://github.com/FasterXML/stax2-api)
 ------------------------------------------------------------

-    Version: 4.2
+    Version: 4.2.1
    From: 'FasterXML, LLC' (http://fasterxml.com/)
    License(s):
-        BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE)
+        BSD Simplified (bundled/woodstox-stax2-api-4.2.1/LICENSE)

--- a/doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt
+++ b/doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt
@@ -0,0 +1 @@
+org.codehaus.woodstox:stax2-api:jar:4.2.1
--- a/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
+++ b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
@@ -1 +0,0 @@
-org.codehaus.woodstox:stax2-api:jar:4.2
--- a/doc/licenses/zxing-3.5.2/dep-coordinates.txt
+++ b/doc/licenses/zxing-3.5.2/dep-coordinates.txt
@@ -1,2 +0,0 @@
-com.google.zxing:core:jar:3.5.2
-com.google.zxing:javase:jar:3.5.2
--- a/doc/licenses/zxing-3.5.3/AUTHORS
+++ b/doc/licenses/zxing-3.5.3/AUTHORS
--- a/doc/licenses/zxing-3.5.3/NOTICE
+++ b/doc/licenses/zxing-3.5.3/NOTICE
--- a/doc/licenses/zxing-3.5.3/README
+++ b/doc/licenses/zxing-3.5.3/README
@@ -1,7 +1,7 @@
 ZXing Barcode Scanning Library (https://github.com/zxing/zxing/)
 ----------------------------------------------------------------

-    Version: 3.5.2
+    Version: 3.5.3
    From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.2/AUTHORS)
    License(s):
        Apache v2.0
--- a/doc/licenses/zxing-3.5.3/dep-coordinates.txt
+++ b/doc/licenses/zxing-3.5.3/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.google.zxing:core:jar:3.5.3
+com.google.zxing:javase:jar:3.5.3
--- 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 @@
        <dependency>
            <groupId>org.mybatis</groupId>
            <artifactId>mybatis</artifactId>
-            <version>3.5.14</version>
+            <version>3.5.15</version>
        </dependency>
        
        <!-- MyBatis Guice -->
--- a/extensions/guacamole-auth-json/pom.xml
+++ b/extensions/guacamole-auth-json/pom.xml
@@ -77,7 +77,7 @@
        <dependency>
            <groupId>com.github.seancfoley</groupId>
            <artifactId>ipaddress</artifactId>
-            <version>5.4.0</version>
+            <version>5.5.0</version>
        </dependency>

        <!-- JUnit -->
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -51,7 +51,7 @@
        <dependency>
            <groupId>org.apache.directory.api</groupId>
            <artifactId>api-all</artifactId>
-            <version>2.1.5</version>
+            <version>2.1.6</version>
            <exclusions>

                <!--
--- 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 @@
        <dependency>
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
-            <version>1.16.0</version>
+            <version>1.16.1</version>
        </dependency>

    </dependencies>
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
@@ -106,7 +106,7 @@
        <dependency>
            <groupId>org.bitbucket.b_c</groupId>
            <artifactId>jose4j</artifactId>
-            <version>0.9.3</version>
+            <version>0.9.5</version>
        </dependency>

        <!-- Guice -->
--- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
+++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
@@ -122,14 +122,14 @@
        <dependency>
            <groupId>com.fasterxml.woodstox</groupId>
            <artifactId>woodstox-core</artifactId>
-            <version>5.4.0</version>
+            <version>6.5.0</version>
        </dependency>

        <!-- Apache XML Security for Java (see exclusions for java-saml) -->
        <dependency>
            <groupId>org.apache.santuario</groupId>
            <artifactId>xmlsec</artifactId>
-            <version>2.2.6</version>
+            <version>2.3.4</version>
            <exclusions>

                <!--
@@ -157,7 +157,7 @@
        <dependency>
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
-            <version>1.16.0</version>
+            <version>1.16.1</version>
        </dependency>

    </dependencies>
--- a/extensions/guacamole-auth-totp/pom.xml
+++ b/extensions/guacamole-auth-totp/pom.xml
@@ -162,12 +162,12 @@
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>javase</artifactId>
-            <version>3.5.2</version>
+            <version>3.5.3</version>
        </dependency>
        <dependency>
            <groupId>com.google.zxing</groupId>
            <artifactId>core</artifactId>
-            <version>3.5.2</version>
+            <version>3.5.3</version>
        </dependency>

        <!-- Guacamole depends on an implementation of JAX-WS -->
--- a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
+++ b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
@@ -38,7 +38,7 @@
    </parent>

    <properties>
-        <kotlin.version>1.9.21</kotlin.version>
+        <kotlin.version>1.9.22</kotlin.version>
    </properties>

    <dependencies>
@@ -60,7 +60,7 @@
        <dependency>
            <groupId>com.keepersecurity.secrets-manager</groupId>
            <artifactId>core</artifactId>
-            <version>16.6.2</version>
+            <version>16.6.3</version>

            <!-- Correct version conflict (different versions across transitive
                dependencies) -->
--- a/guacamole/src/main/frontend/package-lock.json
+++ b/guacamole/src/main/frontend/package-lock.json
@@ -9,9 +9,9 @@
                "angular": "^1.8.3",
                "angular-route": "^1.8.3",
                "angular-templatecache-webpack-plugin": "^1.0.1",
-                "angular-translate": "^2.19.0",
-                "angular-translate-interpolation-messageformat": "^2.19.0",
-                "angular-translate-loader-static-files": "^2.19.0",
+                "angular-translate": "^2.19.1",
+                "angular-translate-interpolation-messageformat": "^2.19.1",
+                "angular-translate-loader-static-files": "^2.19.1",
                "blob-polyfill": ">=7.0.20220408",
                "csv": "^6.2.5",
                "d3-path": "^3.1.0",
@@ -2359,9 +2359,10 @@
            }
        },
        "node_modules/angular-translate": {
-            "version": "2.19.0",
-            "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
-            "integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
+            "version": "2.19.1",
+            "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.1.tgz",
+            "integrity": "sha512-SrU40ndnL422vXiVoqVveCmSnCzMcIXxQgnl7Cv9krOKUg6B8KZK3ddYzidHR/rxVuySezYHNDgRvzQNKwAdNQ==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
            "dependencies": {
                "angular": "^1.8.0"
            },
@@ -2370,20 +2371,22 @@
            }
        },
        "node_modules/angular-translate-interpolation-messageformat": {
-            "version": "2.19.0",
-            "resolved": "https://registry.npmjs.org/angular-translate-interpolation-messageformat/-/angular-translate-interpolation-messageformat-2.19.0.tgz",
-            "integrity": "sha512-XcH1Gfb/I7SRPBToSQfH3x3O4J4kQpm7RL9+zsAIVT18gjXVZJYoLlsjpo0hhzZgrHXPCqTcLVt2Q+WczvpYZA==",
+            "version": "2.19.1",
+            "resolved": "https://registry.npmjs.org/angular-translate-interpolation-messageformat/-/angular-translate-interpolation-messageformat-2.19.1.tgz",
+            "integrity": "sha512-Rh3m1IKWQTlMqRmgQMwaVlgN/oSkcuEW2v+wFsTPAly+tphWl4HVRiKa54gb9QSX2QRoIfgaRX9T+eNiEKABjQ==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
            "dependencies": {
-                "angular-translate": "~2.19.0",
+                "angular-translate": "~2.19.1",
                "messageformat": "~1.0.2"
            }
        },
        "node_modules/angular-translate-loader-static-files": {
-            "version": "2.19.0",
-            "resolved": "https://registry.npmjs.org/angular-translate-loader-static-files/-/angular-translate-loader-static-files-2.19.0.tgz",
-            "integrity": "sha512-B0LiFzn+rHGgL0okl+uAcQKtmySskTlhw6vsnQODUqARV0IcgMUi2tl9RhybgGy3MbGmdF1JjJFjITCbXzWZQA==",
+            "version": "2.19.1",
+            "resolved": "https://registry.npmjs.org/angular-translate-loader-static-files/-/angular-translate-loader-static-files-2.19.1.tgz",
+            "integrity": "sha512-gw4rps7lMaddrouhRUZh4GcWMKL52zzYbW/5YATfpoSrk8B+jxP8Q0BpmCBmXg79gvPsSQvt2DI/ygN91x7z0g==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
            "dependencies": {
-                "angular-translate": "~2.19.0"
+                "angular-translate": "~2.19.1"
            }
        },
        "node_modules/ansi-colors": {
@@ -13187,28 +13190,28 @@
            }
        },
        "angular-translate": {
-            "version": "2.19.0",
-            "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.0.tgz",
-            "integrity": "sha512-Z/Fip5uUT2N85dPQ0sMEe1JdF5AehcDe4tg/9mWXNDVU531emHCg53ZND9Oe0dyNiGX5rWcJKmsL1Fujus1vGQ==",
+            "version": "2.19.1",
+            "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.19.1.tgz",
+            "integrity": "sha512-SrU40ndnL422vXiVoqVveCmSnCzMcIXxQgnl7Cv9krOKUg6B8KZK3ddYzidHR/rxVuySezYHNDgRvzQNKwAdNQ==",
            "requires": {
                "angular": "^1.8.0"
            }
        },
        "angular-translate-interpolation-messageformat": {
-            "version": "2.19.0",
-            "resolved": "https://registry.npmjs.org/angular-translate-interpolation-messageformat/-/angular-translate-interpolation-messageformat-2.19.0.tgz",
-            "integrity": "sha512-XcH1Gfb/I7SRPBToSQfH3x3O4J4kQpm7RL9+zsAIVT18gjXVZJYoLlsjpo0hhzZgrHXPCqTcLVt2Q+WczvpYZA==",
+            "version": "2.19.1",
+            "resolved": "https://registry.npmjs.org/angular-translate-interpolation-messageformat/-/angular-translate-interpolation-messageformat-2.19.1.tgz",
+            "integrity": "sha512-Rh3m1IKWQTlMqRmgQMwaVlgN/oSkcuEW2v+wFsTPAly+tphWl4HVRiKa54gb9QSX2QRoIfgaRX9T+eNiEKABjQ==",
            "requires": {
-                "angular-translate": "~2.19.0",
+                "angular-translate": "~2.19.1",
                "messageformat": "~1.0.2"
            }
        },
        "angular-translate-loader-static-files": {
-            "version": "2.19.0",
-            "resolved": "https://registry.npmjs.org/angular-translate-loader-static-files/-/angular-translate-loader-static-files-2.19.0.tgz",
-            "integrity": "sha512-B0LiFzn+rHGgL0okl+uAcQKtmySskTlhw6vsnQODUqARV0IcgMUi2tl9RhybgGy3MbGmdF1JjJFjITCbXzWZQA==",
+            "version": "2.19.1",
+            "resolved": "https://registry.npmjs.org/angular-translate-loader-static-files/-/angular-translate-loader-static-files-2.19.1.tgz",
+            "integrity": "sha512-gw4rps7lMaddrouhRUZh4GcWMKL52zzYbW/5YATfpoSrk8B+jxP8Q0BpmCBmXg79gvPsSQvt2DI/ygN91x7z0g==",
            "requires": {
-                "angular-translate": "~2.19.0"
+                "angular-translate": "~2.19.1"
            }
        },
        "ansi-colors": {
--- a/guacamole/src/main/frontend/package.json
+++ b/guacamole/src/main/frontend/package.json
@@ -8,9 +8,9 @@
        "angular": "^1.8.3",
        "angular-route": "^1.8.3",
        "angular-templatecache-webpack-plugin": "^1.0.1",
-        "angular-translate": "^2.19.0",
-        "angular-translate-interpolation-messageformat": "^2.19.0",
-        "angular-translate-loader-static-files": "^2.19.0",
+        "angular-translate": "^2.19.1",
+        "angular-translate-interpolation-messageformat": "^2.19.1",
+        "angular-translate-loader-static-files": "^2.19.1",
        "blob-polyfill": ">=7.0.20220408",
        "csv": "^6.2.5",
        "d3-path": "^3.1.0",
--- a/pom.xml
+++ b/pom.xml
@@ -39,13 +39,13 @@
        <guava.version>32.1.3-jre</guava.version>
        <guice.version>5.1.0</guice.version>
        <hk2.version>2.6.1</hk2.version>
-        <jackson.version>2.16.0</jackson.version>
-        <jackson-databind.version>2.16.0</jackson-databind.version>
+        <jackson.version>2.16.1</jackson.version>
+        <jackson-databind.version>2.16.1</jackson-databind.version>
        <jersey.version>2.41</jersey.version>
-        <junit.version>5.10.1</junit.version>
+        <junit.version>5.10.2</junit.version>
        <junit4.version>4.13.2</junit4.version>
        <logback.version>1.3.14</logback.version>
-        <slf4j.version>2.0.9</slf4j.version>
+        <slf4j.version>2.0.12</slf4j.version>

        <!-- The directory that should receive all generated dependency lists
            (for LICENSE generation) -->
				`@@ -1 +0,0 @@`
				`com.fasterxml.jackson.core:jackson-databind:jar:2.16.0`
				`@@ -0,0 +1 @@`
				`com.fasterxml.jackson.core:jackson-databind:jar:2.16.1`
				`@@ -1 +0,0 @@`
				`com.keepersecurity.secrets-manager:core:jar:16.6.2`
				`@@ -1 +0,0 @@`
				`com.fasterxml.woodstox:woodstox-core:jar:5.4.0`