Merge 1.5.0 changes back to master.

doc/guacamole-example/pom.xml

@@ -26,7 +26,7 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-example</artifactId>
     <packaging>war</packaging>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <name>guacamole-example</name>
     <url>http://guacamole.apache.org/</url>
 
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.0</version>
             <type>zip</type>
             <scope>runtime</scope>
         </dependency>
@@ -122,7 +122,7 @@
 	<dependency>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-simple</artifactId>
-		<version>2.0.3</version>
+		<version>2.0.6</version>
 	</dependency>
 
 

doc/guacamole-playback-example/pom.xml

@@ -26,7 +26,7 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-playback-example</artifactId>
     <packaging>war</packaging>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <name>guacamole-playback-example</name>
     <url>http://guacamole.apache.org/</url>
 
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
-            <version>1.4.0</version>
+            <version>1.5.0</version>
             <type>zip</type>
             <scope>runtime</scope>
         </dependency>

doc/licenses/jackson-2.14.1/README

@@ -1,7 +1,7 @@
 Jackson (https://github.com/FasterXML/jackson)
 ----------------------------------------------
 
-    Version: 2.14.0
+    Version: 2.14.1
     From: 'FasterXML, LLC' (https://github.com/FasterXML)
     License(s):
         Apache v2.0

doc/licenses/jackson-2.14.1/dep-coordinates.txt

@@ -1,4 +1,4 @@
-com.fasterxml.jackson.core:jackson-core:jar:2.14.0
-com.fasterxml.jackson.core:jackson-annotations:jar:2.14.0
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.14.0
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.14.0
+com.fasterxml.jackson.core:jackson-core:jar:2.14.1
+com.fasterxml.jackson.core:jackson-annotations:jar:2.14.1
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.14.1
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.14.1

doc/licenses/jackson-databind-2.14.0/dep-coordinates.txt

@@ -1 +0,0 @@
-com.fasterxml.jackson.core:jackson-databind:jar:2.14.0

doc/licenses/jackson-databind-2.14.1/README

@@ -1,7 +1,7 @@
 Jackson-databind (https://github.com/FasterXML/jackson-databind)
 ----------------------------------------------
 
-    Version: 2.14.0
+    Version: 2.14.1
     From: 'FasterXML, LLC' (https://github.com/FasterXML)
     License(s):
         Apache v2.0

doc/licenses/jackson-databind-2.14.1/dep-coordinates.txt

@@ -0,0 +1 @@
+com.fasterxml.jackson.core:jackson-databind:jar:2.14.1

doc/licenses/javassist-3.25.0-ga/dep-coordinates.txt

@@ -1 +0,0 @@
-org.javassist:javassist:jar:3.25.0-GA

doc/licenses/javassist-3.29.0-ga/README

@@ -1,7 +1,7 @@
 Javassist (https://www.javassist.org/)
 --------------------------------------
 
-    Version: 3.25.0-GA
+    Version: 3.29.0-GA
     From: 'Shigeru Chiba' (https://github.com/chibash)
     License(s):
         Apache v2.0

doc/licenses/javassist-3.29.0-ga/dep-coordinates.txt

@@ -0,0 +1 @@
+org.javassist:javassist:jar:3.29.0-GA

doc/licenses/jersey-2.37/dep-coordinates.txt

@@ -1,7 +0,0 @@
-org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.37
-org.glassfish.jersey.core:jersey-common:jar:2.37
-org.glassfish.jersey.core:jersey-server:jar:2.37
-org.glassfish.jersey.core:jersey-client:jar:2.37
-org.glassfish.jersey.inject:jersey-hk2:jar:2.37
-org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.37
-org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.37

doc/licenses/jersey-2.38/README

@@ -1,8 +1,8 @@
 Jersey (https://jersey.java.net/)
 ---------------------------------
 
-    Version: 2.37
+    Version: 2.38
     From: 'Eclipse Foundation' (https://www.eclipse.org/)
     License(s):
-        EPL v2.0 (bundled/jersey-2.37/LICENSE.md)
+        EPL v2.0 (bundled/jersey-2.38/LICENSE.md)
 

doc/licenses/jersey-2.38/dep-coordinates.txt

@@ -0,0 +1,7 @@
+org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.38
+org.glassfish.jersey.core:jersey-common:jar:2.38
+org.glassfish.jersey.core:jersey-server:jar:2.38
+org.glassfish.jersey.core:jersey-client:jar:2.38
+org.glassfish.jersey.inject:jersey-hk2:jar:2.38
+org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.38
+org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.38

doc/licenses/jquery-3.6.1/README

@@ -1,8 +1,8 @@
 jQuery (http://jquery.com/)
 ---------------------------
 
-    Version: 3.6.1
+    Version: 3.6.3
     From: 'OpenJS Foundation' (https://openjsf.org/)
     License(s):
-        MIT (bundled/jquery-3.6.1/LICENSE.txt)
+        MIT (bundled/jquery-3.6.3/LICENSE.txt)
 

doc/licenses/jquery-3.6.1/dep-coordinates.txt

@@ -1 +1 @@
-jquery:3.6.1
+jquery:3.6.3

doc/licenses/kotlin-1.7.20/dep-coordinates.txt

@@ -1,5 +0,0 @@
-org.jetbrains.kotlin:kotlin-reflect:jar:1.7.20
-org.jetbrains.kotlin:kotlin-stdlib:jar:1.7.20
-org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.7.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.7.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.7.20

doc/licenses/kotlin-1.8.0/README

@@ -1,7 +1,7 @@
 Kotlin (https://kotlinlang.org/)
 --------------------------------
 
-    Version: 1.7.20
+    Version: 1.8.0
     From: 'JetBrains s.r.o and respective authors and developers'
     License(s):
         Apache v2.0

doc/licenses/kotlin-1.8.0/dep-coordinates.txt

@@ -0,0 +1,5 @@
+org.jetbrains.kotlin:kotlin-reflect:jar:1.8.0
+org.jetbrains.kotlin:kotlin-stdlib:jar:1.8.0
+org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.8.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.8.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.8.0

doc/licenses/logback-1.3.4/dep-coordinates.txt

@@ -1,2 +0,0 @@
-ch.qos.logback:logback-classic:jar:1.3.4
-ch.qos.logback:logback-core:jar:1.3.4

doc/licenses/logback-1.3.5/README

@@ -1,8 +1,8 @@
 Logback (http://logback.qos.ch/)
 --------------------------------
 
-    Version: 1.3.4
+    Version: 1.3.5
     From: 'QOS.ch Sàrl' (http://qos.ch/)
     License(s):
-        EPL v1.0 (bundled/logback-1.3.4/LICENSE.txt)
+        EPL v1.0 (bundled/logback-1.3.5/LICENSE.txt)
 

doc/licenses/logback-1.3.5/dep-coordinates.txt

@@ -0,0 +1,2 @@
+ch.qos.logback:logback-classic:jar:1.3.5
+ch.qos.logback:logback-core:jar:1.3.5

doc/licenses/mybatis-guice-3.17/dep-coordinates.txt

@@ -1 +0,0 @@
-org.mybatis:mybatis-guice:jar:3.17

doc/licenses/mybatis-guice-3.18/README

@@ -1,7 +1,7 @@
 MyBatis-Guice (http://www.mybatis.org/guice/)
 ---------------------------------------------
 
-    Version: 3.17
+    Version: 3.18
     From: 'MyBatis' (http://www.mybatis.org/)
     License(s):
         Apache v2.0

doc/licenses/mybatis-guice-3.18/dep-coordinates.txt

@@ -0,0 +1 @@
+org.mybatis:mybatis-guice:jar:3.18

doc/licenses/slf4j-api-2.0.3/dep-coordinates.txt

@@ -1,2 +0,0 @@
-org.slf4j:jul-to-slf4j:jar:2.0.3
-org.slf4j:slf4j-api:jar:2.0.3

doc/licenses/slf4j-api-2.0.6/README

@@ -1,8 +1,8 @@
 Simple Logging Facade for Java (http://slf4j.org/)
 --------------------------------------------------
 
-    Version: 2.0.3
+    Version: 2.0.6
     From: 'QOS.ch Sàrl' (http://qos.ch/)
     License(s):
-        MIT (bundled/slf4j-api-2.0.3/LICENSE.txt)
+        MIT (bundled/slf4j-api-2.0.6/LICENSE.txt)
 

doc/licenses/slf4j-api-2.0.6/dep-coordinates.txt

@@ -0,0 +1,2 @@
+org.slf4j:jul-to-slf4j:jar:2.0.6
+org.slf4j:slf4j-api:jar:2.0.6

doc/licenses/spring-framework-5.3.23/dep-coordinates.txt

@@ -1,7 +0,0 @@
-org.springframework:spring-aop:jar:5.3.23
-org.springframework:spring-beans:jar:5.3.23
-org.springframework:spring-context:jar:5.3.23
-org.springframework:spring-core:jar:5.3.23
-org.springframework:spring-expression:jar:5.3.23
-org.springframework:spring-jcl:jar:5.3.23
-org.springframework:spring-web:jar:5.3.23

doc/licenses/spring-framework-5.3.24/README

@@ -1,7 +1,7 @@
 Spring Framework (https://spring.io/projects/spring-framework)
 --------------------------------------------------------------
 
-    Version: 5.3.23
+    Version: 5.3.24
     From: 'Spring' (https://spring.io/)
     License(s):
         Apache v2.0

doc/licenses/spring-framework-5.3.24/dep-coordinates.txt

@@ -0,0 +1,7 @@
+org.springframework:spring-aop:jar:5.3.24
+org.springframework:spring-beans:jar:5.3.24
+org.springframework:spring-context:jar:5.3.24
+org.springframework:spring-core:jar:5.3.24
+org.springframework:spring-expression:jar:5.3.24
+org.springframework:spring-jcl:jar:5.3.24
+org.springframework:spring-web:jar:5.3.24

doc/licenses/spring-security-5.7.5/dep-coordinates.txt

@@ -1,3 +0,0 @@
-org.springframework.security:spring-security-core:jar:5.7.5
-org.springframework.security:spring-security-crypto:jar:5.7.5
-org.springframework.security:spring-security-web:jar:5.7.5

doc/licenses/spring-security-5.8.1/README

@@ -1,7 +1,7 @@
 Spring Security (https://spring.io/projects/spring-security)
 ------------------------------------------------------------
 
-    Version: 5.7.5
+    Version: 5.8.1
     From: 'Spring' (https://spring.io/)
     License(s):
         Apache v2.0

doc/licenses/spring-security-5.8.1/dep-coordinates.txt

@@ -0,0 +1,3 @@
+org.springframework.security:spring-security-core:jar:5.8.1
+org.springframework.security:spring-security-crypto:jar:5.8.1
+org.springframework.security:spring-security-web:jar:5.8.1