Merge 1.5.3 changes back to master.

This commit is contained in:
Mike Jumper
2023-07-04 09:11:34 -07:00
49 changed files with 99 additions and 98 deletions

View File

@@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId>
<packaging>war</packaging>
<version>1.5.2</version>
<version>1.5.3</version>
<name>guacamole</name>
<url>http://guacamole.apache.org/</url>
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<relativePath>../</relativePath>
</parent>
@@ -246,14 +246,14 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
</dependency>
<!-- Guacamole JavaScript API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>1.5.2</version>
<version>1.5.3</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

View File

@@ -71,7 +71,8 @@ public class ExtensionModule extends ServletModule {
"1.4.0",
"1.5.0",
"1.5.1",
"1.5.2"
"1.5.2",
"1.5.3"
));
/**