Merge changes from patch branch back to main.

2025-09-06 05:07:41 +00:00 · 2024-06-11 11:19:52 -07:00
parent 60f53e9f86 62820f12a3
commit 284353da48
31 changed files with 81 additions and 61 deletions
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -122,7 +122,7 @@
 	<dependency>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-simple</artifactId>
-		<version>2.0.7</version>
+		<version>2.0.13</version>
 	</dependency>


--- a/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
+++ b/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
@@ -1 +0,0 @@
-commons-codec:commons-codec:jar:1.16.1
--- a/doc/licenses/apache-commons-1.17.0/NOTICE
+++ b/doc/licenses/apache-commons-1.17.0/NOTICE
--- a/doc/licenses/apache-commons-1.17.0/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
--- a/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt
+++ b/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-codec:commons-codec:jar:1.17.0
--- a/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt
+++ b/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt
@@ -1 +0,0 @@
-org.bouncycastle:bc-fips:jar:1.0.2.4
--- a/doc/licenses/bouncycastle-fips-1.0.2.5/LICENSE
+++ b/doc/licenses/bouncycastle-fips-1.0.2.5/LICENSE
--- a/doc/licenses/bouncycastle-fips-1.0.2.5/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)

--- a/doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt
+++ b/doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bc-fips:jar:1.0.2.5
--- a/doc/licenses/jakarta-validation-api-2.1.3/NOTICE
+++ 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.
+
--- a/doc/licenses/jakarta-validation-api-2.1.3/README
+++ 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
+
--- a/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
+++ b/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.validation:jakarta.validation-api:jar:2.1.3
--- a/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt
+++ b/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt
@@ -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
--- a/doc/licenses/kotlinx-serialization-1.6.3/NOTICE.txt
+++ b/doc/licenses/kotlinx-serialization-1.6.3/NOTICE.txt
--- a/doc/licenses/kotlinx-serialization-1.6.3/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
--- a/doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt
+++ 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
--- a/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
+++ b/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
@@ -1 +0,0 @@
-com.keepersecurity.secrets-manager:core:jar:16.6.3
--- a/doc/licenses/ksm-sdk-16.6.4/LICENSE
+++ b/doc/licenses/ksm-sdk-16.6.4/LICENSE
--- a/doc/licenses/ksm-sdk-16.6.4/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)

--- a/doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt
+++ b/doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt
@@ -0,0 +1 @@
+com.keepersecurity.secrets-manager:core:jar:16.6.4
--- a/doc/licenses/mybatis-3.5.15/dep-coordinates.txt
+++ b/doc/licenses/mybatis-3.5.15/dep-coordinates.txt
@@ -1 +0,0 @@
-org.mybatis:mybatis:jar:3.5.15
--- a/doc/licenses/mybatis-3.5.16/NOTICE
+++ b/doc/licenses/mybatis-3.5.16/NOTICE
--- a/doc/licenses/mybatis-3.5.16/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
--- a/doc/licenses/mybatis-3.5.16/dep-coordinates.txt
+++ b/doc/licenses/mybatis-3.5.16/dep-coordinates.txt
@@ -0,0 +1 @@
+org.mybatis:mybatis:jar:3.5.16
				`@@ -0,0 +1 @@`
				`jakarta.validation:jakarta.validation-api:jar:2.1.3`
				`@@ -1 +0,0 @@`
				`com.keepersecurity.secrets-manager:core:jar:16.6.3`