GUACAMOLE-1594: Merge Java dependency version bumps to latest compatible versions.

This commit is contained in:
James Muehlner
2022-11-09 14:58:44 -08:00
committed by GitHub
21 changed files with 33 additions and 19 deletions

View File

@@ -1,5 +1,5 @@
Apache Commons Text Apache Commons Text
Copyright 2014-2020 The Apache Software Foundation Copyright 2014-2022 The Apache Software Foundation
This product includes software developed at This product includes software developed at
The Apache Software Foundation (https://www.apache.org/). The Apache Software Foundation (https://www.apache.org/).

View File

@@ -1,7 +1,7 @@
Apache Commons Text (https://commons.apache.org/proper/commons-text/) Apache Commons Text (https://commons.apache.org/proper/commons-text/)
--------------------------------------------------------------------- ---------------------------------------------------------------------
Version: 1.9 Version: 1.10.0
From: 'Apache Software Foundation' (https://www.apache.org/) From: 'Apache Software Foundation' (https://www.apache.org/)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.commons:commons-text:jar:1.10.0

View File

@@ -1 +0,0 @@
org.apache.commons:commons-text:jar:1.9

View File

@@ -1,7 +1,7 @@
Jackson (https://github.com/FasterXML/jackson) Jackson (https://github.com/FasterXML/jackson)
---------------------------------------------- ----------------------------------------------
Version: 2.13.4 Version: 2.14.0
From: 'FasterXML, LLC' (https://github.com/FasterXML) From: 'FasterXML, LLC' (https://github.com/FasterXML)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -1,4 +1,4 @@
com.fasterxml.jackson.core:jackson-core:jar:2.13.4 com.fasterxml.jackson.core:jackson-core:jar:2.14.0
com.fasterxml.jackson.core:jackson-annotations:jar:2.13.4 com.fasterxml.jackson.core:jackson-annotations:jar:2.14.0
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.13.4 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.14.0
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.13.4 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.14.0

View File

@@ -1 +0,0 @@
com.fasterxml.jackson.core:jackson-databind:jar:2.13.4.2

View File

@@ -1,7 +1,7 @@
Jackson-databind (https://github.com/FasterXML/jackson-databind) Jackson-databind (https://github.com/FasterXML/jackson-databind)
---------------------------------------------- ----------------------------------------------
Version: 2.13.4.2 Version: 2.14.0
From: 'FasterXML, LLC' (https://github.com/FasterXML) From: 'FasterXML, LLC' (https://github.com/FasterXML)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1 @@
com.fasterxml.jackson.core:jackson-databind:jar:2.14.0

View File

@@ -1 +0,0 @@
org.yaml:snakeyaml:jar:1.31

View File

@@ -1,7 +1,7 @@
SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/ SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/
----------------------------------------------------- -----------------------------------------------------
Version: 1.31 Version: 1.33
From: 'Andrey Somov' (https://bitbucket.org/asomov/) From: 'Andrey Somov' (https://bitbucket.org/asomov/)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1 @@
org.yaml:snakeyaml:jar:1.33

View File

@@ -1,3 +0,0 @@
org.springframework.security:spring-security-core:jar:5.7.4
org.springframework.security:spring-security-crypto:jar:5.7.4
org.springframework.security:spring-security-web:jar:5.7.4

View File

@@ -1,7 +1,7 @@
Spring Security (https://spring.io/projects/spring-security) Spring Security (https://spring.io/projects/spring-security)
------------------------------------------------------------ ------------------------------------------------------------
Version: 5.7.4 Version: 5.7.5
From: 'Spring' (https://spring.io/) From: 'Spring' (https://spring.io/)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1,3 @@
org.springframework.security:spring-security-core:jar:5.7.5
org.springframework.security:spring-security-crypto:jar:5.7.5
org.springframework.security:spring-security-web:jar:5.7.5

View File

@@ -77,7 +77,7 @@
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId> <artifactId>spring-security-web</artifactId>
<version>5.7.4</version> <version>5.7.5</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -61,6 +61,12 @@
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</exclusion> </exclusion>
<!-- Use latest version of commons-text -->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@@ -72,6 +78,14 @@
<version>3.12.0</version> <version>3.12.0</version>
</dependency> </dependency>
<!-- Force latest version of commons-text (transitive dependency from
Apache Directory API -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
</dependency>
<!-- Guice --> <!-- Guice -->
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>

View File

@@ -39,8 +39,8 @@
<guava.version>31.1-jre</guava.version> <guava.version>31.1-jre</guava.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>
<hk2.version>2.6.1</hk2.version> <hk2.version>2.6.1</hk2.version>
<jackson.version>2.13.4</jackson.version> <jackson.version>2.14.0</jackson.version>
<jackson-databind.version>2.13.4.2</jackson-databind.version> <jackson-databind.version>2.14.0</jackson-databind.version>
<jersey.version>2.37</jersey.version> <jersey.version>2.37</jersey.version>
<junit.version>5.9.1</junit.version> <junit.version>5.9.1</junit.version>
<junit4.version>4.13.2</junit4.version> <junit4.version>4.13.2</junit4.version>