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

Merge 1.4.0 changes back to master.

Browse Source
This commit is contained in:
Virtually Nick
2021-12-27 09:32:39 -05:00
parent 881d203080 52d10b2ba0
commit 20eec4bbb0
120 changed files with 2853 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
guacamole/pom.xml
View File

@@ -325,31 +325,17 @@
<artifactId>jersey-media-json-jackson</artifactId>
<exclusions>
<!-- Use newer 2.12.2 version required by Guacamole, rather
than 2.11.3 version required by Jersey (see below) -->
<!-- Resolve version conflict (see below - transitive
dependencies of jersey-media-json-jackson disagree on
1.2.1 vs. 1.2.2) -->
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Force newer version of Jackson, rather than slightly older version
specified by Jersey -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>
<!-- JSR-250 annotations -->
<dependency>
<groupId>javax.annotation</groupId>
@@ -363,6 +349,14 @@
<artifactId>guava</artifactId>
</dependency>
<!-- Force use of version 1.2.2 (transitive dependencies of
jersey-media-json-jackson disagree on 1.2.1 vs. 1.2.2) -->
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.2</version>
</dependency>
</dependencies>
</project>

1117
guacamole/src/main/frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff