mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 13:17:41 +00:00
Merge 1.5.1 changes back to master.
This commit is contained in:
@@ -57,7 +57,7 @@
|
||||
<dependency>
|
||||
<groupId>org.mybatis</groupId>
|
||||
<artifactId>mybatis</artifactId>
|
||||
<version>3.5.11</version>
|
||||
<version>3.5.13</version>
|
||||
</dependency>
|
||||
|
||||
<!-- MyBatis Guice -->
|
||||
|
@@ -77,7 +77,7 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework.security</groupId>
|
||||
<artifactId>spring-security-web</artifactId>
|
||||
<version>5.8.1</version>
|
||||
<version>5.8.2</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
@@ -106,7 +106,7 @@
|
||||
<dependency>
|
||||
<groupId>org.bitbucket.b_c</groupId>
|
||||
<artifactId>jose4j</artifactId>
|
||||
<version>0.9.1</version>
|
||||
<version>0.9.3</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Guice -->
|
||||
|
@@ -162,12 +162,12 @@
|
||||
<dependency>
|
||||
<groupId>com.google.zxing</groupId>
|
||||
<artifactId>javase</artifactId>
|
||||
<version>3.5.0</version>
|
||||
<version>3.5.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.zxing</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>3.5.0</version>
|
||||
<version>3.5.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Guacamole depends on an implementation of JAX-WS -->
|
||||
|
@@ -38,7 +38,7 @@
|
||||
</parent>
|
||||
|
||||
<properties>
|
||||
<kotlin.version>1.8.0</kotlin.version>
|
||||
<kotlin.version>1.8.20</kotlin.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@@ -60,7 +60,7 @@
|
||||
<dependency>
|
||||
<groupId>com.keepersecurity.secrets-manager</groupId>
|
||||
<artifactId>core</artifactId>
|
||||
<version>16.4.0</version>
|
||||
<version>16.5.2</version>
|
||||
|
||||
<!-- Correct version conflict (different versions across transitive
|
||||
dependencies) -->
|
||||
|
Reference in New Issue
Block a user