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

@@ -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 -->