Merge 1.5.4 changes back to master.

This commit is contained in:
James Muehlner
2023-10-06 18:47:27 +00:00
53 changed files with 175 additions and 105 deletions

View File

@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.1.3</version>
<version>2.1.4</version>
<exclusions>
</exclusions>
</dependency>

View File

@@ -162,12 +162,12 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</dependency>
<!-- Guacamole depends on an implementation of JAX-WS -->

View File

@@ -38,7 +38,7 @@
</parent>
<properties>
<kotlin.version>1.9.0</kotlin.version>
<kotlin.version>1.9.10</kotlin.version>
</properties>
<dependencies>
@@ -60,7 +60,7 @@
<dependency>
<groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId>
<version>16.5.4</version>
<version>16.6.2</version>
<!-- Correct version conflict (different versions across transitive
dependencies) -->
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>1.0.2.3</version>
<version>1.0.2.4</version>
</dependency>
</dependencies>