safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1.5.0 changes back to master.

Browse Source
This commit is contained in:
James Muehlner
2022-10-28 21:30:19 +00:00
parent 882cb5ea45 c8cb124f8a
commit 88d9f40a3d
124 changed files with 10400 additions and 2227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
View File

@@ -38,7 +38,7 @@
</parent>
<properties>
<kotlin.version>1.5.30</kotlin.version>
<kotlin.version>1.7.20</kotlin.version>
</properties>
<dependencies>
@@ -60,11 +60,15 @@
<dependency>
<groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId>
<version>16.2.1</version>
<version>16.4.0</version>
<!-- Correct version conflict (different versions across transitive
dependencies) -->
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
</exclusion>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
@@ -82,6 +86,11 @@
</dependency>
<!-- Use same version of Kotlin across all dependencies -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
@@ -93,6 +102,13 @@
<version>${kotlin.version}</version>
</dependency>
<!-- Use FIPS variant of Bouncy Castle crypto library -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>1.0.2.3</version>
</dependency>
</dependencies>
</project>