Merge 1.5.0 changes back to master.

This commit is contained in:
Mike Jumper
2023-01-10 21:52:26 -08:00
90 changed files with 638 additions and 359 deletions

View File

@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<relativePath>../../</relativePath>
</parent>

View File

@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<relativePath>../../</relativePath>
</parent>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault-ksm</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
</dependencies>

View File

@@ -26,19 +26,19 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault-ksm</artifactId>
<packaging>jar</packaging>
<version>1.4.0</version>
<version>1.5.0</version>
<name>guacamole-vault-ksm</name>
<url>http://guacamole.apache.org/</url>
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<relativePath>../../</relativePath>
</parent>
<properties>
<kotlin.version>1.7.20</kotlin.version>
<kotlin.version>1.8.0</kotlin.version>
</properties>
<dependencies>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault-base</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
<dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "1.4.0",
"guacamoleVersion" : "1.5.0",
"name" : "Keeper Secrets Manager",
"namespace" : "keeper-secrets-manager",