GUACAMOLE-1594: Merge update to latest version of java/javascript dependencies.

This commit is contained in:
James Muehlner
2023-01-10 17:00:19 -08:00
committed by GitHub
46 changed files with 539 additions and 261 deletions

View File

@@ -122,7 +122,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.3</version>
<version>2.0.6</version>
</dependency>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1 +0,0 @@
org.javassist:javassist:jar:3.25.0-GA

View File

@@ -1,7 +1,7 @@
Javassist (https://www.javassist.org/)
--------------------------------------
Version: 3.25.0-GA
Version: 3.29.0-GA
From: 'Shigeru Chiba' (https://github.com/chibash)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.javassist:javassist:jar:3.29.0-GA

View File

@@ -1,7 +0,0 @@
org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.37
org.glassfish.jersey.core:jersey-common:jar:2.37
org.glassfish.jersey.core:jersey-server:jar:2.37
org.glassfish.jersey.core:jersey-client:jar:2.37
org.glassfish.jersey.inject:jersey-hk2:jar:2.37
org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.37
org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.37

View File

@@ -1,8 +1,8 @@
Jersey (https://jersey.java.net/)
---------------------------------
Version: 2.37
Version: 2.38
From: 'Eclipse Foundation' (https://www.eclipse.org/)
License(s):
EPL v2.0 (bundled/jersey-2.37/LICENSE.md)
EPL v2.0 (bundled/jersey-2.38/LICENSE.md)

View File

@@ -0,0 +1,7 @@
org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.38
org.glassfish.jersey.core:jersey-common:jar:2.38
org.glassfish.jersey.core:jersey-server:jar:2.38
org.glassfish.jersey.core:jersey-client:jar:2.38
org.glassfish.jersey.inject:jersey-hk2:jar:2.38
org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.38
org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.38

View File

@@ -1,8 +1,8 @@
jQuery (http://jquery.com/)
---------------------------
Version: 3.6.1
Version: 3.6.3
From: 'OpenJS Foundation' (https://openjsf.org/)
License(s):
MIT (bundled/jquery-3.6.1/LICENSE.txt)
MIT (bundled/jquery-3.6.3/LICENSE.txt)

View File

@@ -1 +1 @@
jquery:3.6.1
jquery:3.6.3

View File

@@ -1,5 +0,0 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.7.20
org.jetbrains.kotlin:kotlin-stdlib:jar:1.7.20
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.7.20
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.7.20
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.7.20

View File

@@ -1,7 +1,7 @@
Kotlin (https://kotlinlang.org/)
--------------------------------
Version: 1.7.20
Version: 1.8.0
From: 'JetBrains s.r.o and respective authors and developers'
License(s):
Apache v2.0

View File

@@ -0,0 +1,5 @@
org.jetbrains.kotlin:kotlin-reflect:jar:1.8.0
org.jetbrains.kotlin:kotlin-stdlib:jar:1.8.0
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.8.0
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.8.0
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.8.0

View File

@@ -1,2 +0,0 @@
ch.qos.logback:logback-classic:jar:1.3.4
ch.qos.logback:logback-core:jar:1.3.4

View File

@@ -1,8 +1,8 @@
Logback (http://logback.qos.ch/)
--------------------------------
Version: 1.3.4
Version: 1.3.5
From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s):
EPL v1.0 (bundled/logback-1.3.4/LICENSE.txt)
EPL v1.0 (bundled/logback-1.3.5/LICENSE.txt)

View File

@@ -0,0 +1,2 @@
ch.qos.logback:logback-classic:jar:1.3.5
ch.qos.logback:logback-core:jar:1.3.5

View File

@@ -1 +0,0 @@
org.mybatis:mybatis-guice:jar:3.17

View File

@@ -1,7 +1,7 @@
MyBatis-Guice (http://www.mybatis.org/guice/)
---------------------------------------------
Version: 3.17
Version: 3.18
From: 'MyBatis' (http://www.mybatis.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.mybatis:mybatis-guice:jar:3.18

View File

@@ -1,2 +0,0 @@
org.slf4j:jul-to-slf4j:jar:2.0.3
org.slf4j:slf4j-api:jar:2.0.3

View File

@@ -1,8 +1,8 @@
Simple Logging Facade for Java (http://slf4j.org/)
--------------------------------------------------
Version: 2.0.3
Version: 2.0.6
From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s):
MIT (bundled/slf4j-api-2.0.3/LICENSE.txt)
MIT (bundled/slf4j-api-2.0.6/LICENSE.txt)

View File

@@ -0,0 +1,2 @@
org.slf4j:jul-to-slf4j:jar:2.0.6
org.slf4j:slf4j-api:jar:2.0.6

View File

@@ -1,7 +0,0 @@
org.springframework:spring-aop:jar:5.3.23
org.springframework:spring-beans:jar:5.3.23
org.springframework:spring-context:jar:5.3.23
org.springframework:spring-core:jar:5.3.23
org.springframework:spring-expression:jar:5.3.23
org.springframework:spring-jcl:jar:5.3.23
org.springframework:spring-web:jar:5.3.23

View File

@@ -1,7 +1,7 @@
Spring Framework (https://spring.io/projects/spring-framework)
--------------------------------------------------------------
Version: 5.3.23
Version: 5.3.24
From: 'Spring' (https://spring.io/)
License(s):
Apache v2.0

View File

@@ -0,0 +1,7 @@
org.springframework:spring-aop:jar:5.3.24
org.springframework:spring-beans:jar:5.3.24
org.springframework:spring-context:jar:5.3.24
org.springframework:spring-core:jar:5.3.24
org.springframework:spring-expression:jar:5.3.24
org.springframework:spring-jcl:jar:5.3.24
org.springframework:spring-web:jar:5.3.24

View File

@@ -1,3 +0,0 @@
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

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

View File

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

View File

@@ -64,7 +64,7 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-guice</artifactId>
<version>3.17</version>
<version>3.18</version>
<exclusions>
<!-- This dependency appears to be necessary only to provide an

View File

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

View File

@@ -38,7 +38,7 @@
</parent>
<properties>
<kotlin.version>1.7.20</kotlin.version>
<kotlin.version>1.8.0</kotlin.version>
</properties>
<dependencies>

File diff suppressed because it is too large Load Diff

View File

@@ -5,8 +5,8 @@
},
"dependencies": {
"@simonwep/pickr": "^1.8.2",
"angular": "^1.8.2",
"angular-route": "^1.8.2",
"angular": "^1.8.3",
"angular-route": "^1.8.3",
"angular-templatecache-webpack-plugin": "^1.0.1",
"angular-translate": "^2.19.0",
"angular-translate-interpolation-messageformat": "^2.19.0",
@@ -14,7 +14,7 @@
"blob-polyfill": ">=7.0.20220408",
"datalist-polyfill": "^1.25.0",
"file-saver": "^2.0.5",
"jquery": "^3.6.1",
"jquery": "^3.6.3",
"jstz": "^2.1.1",
"lodash": "^4.17.21"
},

10
pom.xml
View File

@@ -39,13 +39,13 @@
<guava.version>31.1-jre</guava.version>
<guice.version>5.1.0</guice.version>
<hk2.version>2.6.1</hk2.version>
<jackson.version>2.14.0</jackson.version>
<jackson-databind.version>2.14.0</jackson-databind.version>
<jersey.version>2.37</jersey.version>
<jackson.version>2.14.1</jackson.version>
<jackson-databind.version>2.14.1</jackson-databind.version>
<jersey.version>2.38</jersey.version>
<junit.version>5.9.1</junit.version>
<junit4.version>4.13.2</junit4.version>
<logback.version>1.3.4</logback.version>
<slf4j.version>2.0.3</slf4j.version>
<logback.version>1.3.5</logback.version>
<slf4j.version>2.0.6</slf4j.version>
<!-- The directory that should receive all generated dependency lists
(for LICENSE generation) -->