GUACAMOLE-1956: Merge updates to latest compatible dependency versions.

This commit is contained in:
Mike Jumper
2024-06-11 11:16:10 -07:00
committed by GitHub
31 changed files with 81 additions and 61 deletions

View File

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

View File

@@ -1 +0,0 @@
commons-codec:commons-codec:jar:1.16.1

View File

@@ -1,7 +1,7 @@
Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
----------------------------------------------------------------------- -----------------------------------------------------------------------
Version: 1.16.1 Version: 1.17.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 @@
commons-codec:commons-codec:jar:1.17.0

View File

@@ -1 +0,0 @@
org.bouncycastle:bc-fips:jar:1.0.2.4

View File

@@ -1,8 +1,8 @@
BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java) BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java)
----------------------------------------------------------------------- -----------------------------------------------------------------------
Version: 1.0.2.4 Version: 1.0.2.5
From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org) From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
License(s): License(s):
MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE) MIT (bundled/bouncycastle-fips-1.0.2.5/LICENSE)

View File

@@ -0,0 +1 @@
org.bouncycastle:bc-fips:jar:1.0.2.5

View File

@@ -0,0 +1,11 @@
# Notices for Eclipse Jakarta Bean Validation
This content is produced and maintained by the Eclipse Jakarta Bean Validation
project.
* Project home: https://projects.eclipse.org/projects/ee4j.bean-validation
## Trademarks
Jakarta Bean Validation is a trademark of the Eclipse Foundation.

View File

@@ -0,0 +1,8 @@
Jakarta Bean Validation API (https://beanvalidation.org/)
---------------------------------------------------------
Version: 2.1.3
From: 'Red Hat Inc.' (https://www.redhat.com/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
jakarta.validation:jakarta.validation-api:jar:2.1.3

View File

@@ -1,2 +0,0 @@
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.0
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.0

View File

@@ -1,7 +1,7 @@
Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization) Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization)
---------------------------------------------------------------------- ----------------------------------------------------------------------
Version: 1.6.0 Version: 1.6.3
From: 'JetBrains s.r.o and respective authors and developers' From: 'JetBrains s.r.o and respective authors and developers'
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1,2 @@
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.3
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.3

View File

@@ -1 +0,0 @@
com.keepersecurity.secrets-manager:core:jar:16.6.3

View File

@@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
(https://github.com/Keeper-Security/secrets-manager) (https://github.com/Keeper-Security/secrets-manager)
---------------------------------------------------- ----------------------------------------------------
Version: 16.6.3 Version: 16.6.4
From: 'Keeper Security' (https://www.keepersecurity.com/) From: 'Keeper Security' (https://www.keepersecurity.com/)
License(s): License(s):
MIT (bundled/ksm-sdk-16.6.3/LICENSE) MIT (bundled/ksm-sdk-16.6.4/LICENSE)

View File

@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.6.4

View File

@@ -1 +0,0 @@
org.mybatis:mybatis:jar:3.5.15

View File

@@ -1,7 +1,7 @@
MyBatis (http://www.mybatis.org/mybatis-3/) MyBatis (http://www.mybatis.org/mybatis-3/)
------------------------------------------- -------------------------------------------
Version: 3.5.15 Version: 3.5.16
From: 'MyBatis' (http://www.mybatis.org/) From: 'MyBatis' (http://www.mybatis.org/)
License(s): License(s):
Apache v2.0 Apache v2.0

View File

@@ -0,0 +1 @@
org.mybatis:mybatis:jar:3.5.16

View File

@@ -57,7 +57,7 @@
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
<version>3.5.15</version> <version>3.5.16</version>
</dependency> </dependency>
<!-- MyBatis Guice --> <!-- MyBatis Guice -->

View File

@@ -133,7 +133,7 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.16.1</version> <version>1.17.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -135,7 +135,7 @@
<!-- <!--
Replace slightly older commons-codec (1.15) with newer Replace slightly older commons-codec (1.15) with newer
and identical version to that used by Apache Directory API and identical version to that used by Apache Directory API
for LDAP (1.16.0) so that we don't need two copies of the for LDAP (1.17.0) so that we don't need two copies of the
same license information. same license information.
--> -->
<exclusion> <exclusion>
@@ -157,7 +157,7 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.16.1</version> <version>1.17.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -174,7 +174,7 @@
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId> <artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version> <version>2.1.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

View File

@@ -60,7 +60,7 @@
<dependency> <dependency>
<groupId>com.keepersecurity.secrets-manager</groupId> <groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>16.6.3</version> <version>16.6.4</version>
<!-- Correct version conflict (different versions across transitive <!-- Correct version conflict (different versions across transitive
dependencies) --> dependencies) -->
@@ -106,7 +106,7 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId> <artifactId>bc-fips</artifactId>
<version>1.0.2.4</version> <version>1.0.2.5</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@@ -27,7 +27,7 @@
"css-minimizer-webpack-plugin": "^1.3.0", "css-minimizer-webpack-plugin": "^1.3.0",
"exports-loader": "^1.1.1", "exports-loader": "^1.1.1",
"find-package-json": "^1.2.0", "find-package-json": "^1.2.0",
"google-closure-compiler": "20221004.0.0", "google-closure-compiler": "20240317.0.0",
"html-webpack-plugin": "^4.5.2", "html-webpack-plugin": "^4.5.2",
"mini-css-extract-plugin": "^1.6.2", "mini-css-extract-plugin": "^1.6.2",
"webpack": "^4.47.0", "webpack": "^4.47.0",
@@ -3635,13 +3635,13 @@
} }
}, },
"node_modules/google-closure-compiler": { "node_modules/google-closure-compiler": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20240317.0.0.tgz",
"integrity": "sha512-OKENLrZFF2o3FZ/E4zdTc9NeuAUh1fdwbQxT0sibI19aR62sgNUBo2mLU6sc4Gcm0cQ2gwfB7qX1xnapOIkbaA==", "integrity": "sha512-PlC5aU2vwsypKbxyFNXOW4psDZfhDoOr2dCwuo8VcgQji+HVIgRi2lviO66x2SfTi0ilm3kI6rq/RSdOMFczcQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chalk": "4.x", "chalk": "4.x",
"google-closure-compiler-java": "^20221004.0.0", "google-closure-compiler-java": "^20240317.0.0",
"minimist": "1.x", "minimist": "1.x",
"vinyl": "2.x", "vinyl": "2.x",
"vinyl-sourcemaps-apply": "^0.2.0" "vinyl-sourcemaps-apply": "^0.2.0"
@@ -3653,21 +3653,21 @@
"node": ">=10" "node": ">=10"
}, },
"optionalDependencies": { "optionalDependencies": {
"google-closure-compiler-linux": "^20221004.0.0", "google-closure-compiler-linux": "^20240317.0.0",
"google-closure-compiler-osx": "^20221004.0.0", "google-closure-compiler-osx": "^20240317.0.0",
"google-closure-compiler-windows": "^20221004.0.0" "google-closure-compiler-windows": "^20240317.0.0"
} }
}, },
"node_modules/google-closure-compiler-java": { "node_modules/google-closure-compiler-java": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20240317.0.0.tgz",
"integrity": "sha512-CygLEB40HxtK0VtP6klv2Xm08w4HQNYX/DTgLV7CP74r8LiQMUByRFleaG/Hv5xQG1JzPNiW0GOAiAubDSdr5A==", "integrity": "sha512-oWURPChjcCrVfiQOuVtpSoUJVvtOYo41JGEQ2qtArsTGmk/DpWh40vS6hitwKRM/0YzJX/jYUuyt9ibuXXJKmg==",
"dev": true "dev": true
}, },
"node_modules/google-closure-compiler-linux": { "node_modules/google-closure-compiler-linux": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20240317.0.0.tgz",
"integrity": "sha512-B6sca3Lmw3cYXdFzdU0iQpk8L9VEo1ecC1aM7Gl9lgWhIicqqEZebsgnUe5TQ3uHBfQoKjV9fdFG8mt8X/oqSQ==", "integrity": "sha512-dYLtcbbJdbbBS0lTy9SzySdVv/aGkpyTekQiW4ADhT/i1p1b4r0wQTKj6kpVVmFvbZ6t9tW/jbXc9EXXNUahZw==",
"cpu": [ "cpu": [
"x32", "x32",
"x64" "x64"
@@ -3679,9 +3679,9 @@
] ]
}, },
"node_modules/google-closure-compiler-osx": { "node_modules/google-closure-compiler-osx": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20240317.0.0.tgz",
"integrity": "sha512-z5V7BvaMauPga8DMTt9u6RGcjBdLAuv4gL2Ebw5NIQRTAHVkEVzCd3kiMX7CVCGhmWdS/1r3jZcCg4BswGia6w==", "integrity": "sha512-0mABwjD4HP11rikFd8JRIb9OgPqn9h3o3wS0otufMfmbwS7zRpnnoJkunifhORl3VoR1gFm6vcTC9YziTEFdOw==",
"cpu": [ "cpu": [
"x32", "x32",
"x64", "x64",
@@ -3694,9 +3694,9 @@
] ]
}, },
"node_modules/google-closure-compiler-windows": { "node_modules/google-closure-compiler-windows": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20240317.0.0.tgz",
"integrity": "sha512-JSAWilVa7d65QJYKUr+DmklwKmjkAce6BMD6smqJfdL2dv5OSJ2ydGy73euoBJ4Tka8iQPoaOP+BjLrhIuvqKg==", "integrity": "sha512-fTueVFzNOWURFlXZmrFkAB7yA+jzpA2TeDOYeBEFwVlVGHwi8PV3Q9vCIWlbkE8wLpukKEg5wfRHYrLwVPINCA==",
"cpu": [ "cpu": [
"x32", "x32",
"x64" "x64"
@@ -12021,45 +12021,45 @@
} }
}, },
"google-closure-compiler": { "google-closure-compiler": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20240317.0.0.tgz",
"integrity": "sha512-OKENLrZFF2o3FZ/E4zdTc9NeuAUh1fdwbQxT0sibI19aR62sgNUBo2mLU6sc4Gcm0cQ2gwfB7qX1xnapOIkbaA==", "integrity": "sha512-PlC5aU2vwsypKbxyFNXOW4psDZfhDoOr2dCwuo8VcgQji+HVIgRi2lviO66x2SfTi0ilm3kI6rq/RSdOMFczcQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "4.x", "chalk": "4.x",
"google-closure-compiler-java": "^20221004.0.0", "google-closure-compiler-java": "^20240317.0.0",
"google-closure-compiler-linux": "^20221004.0.0", "google-closure-compiler-linux": "^20240317.0.0",
"google-closure-compiler-osx": "^20221004.0.0", "google-closure-compiler-osx": "^20240317.0.0",
"google-closure-compiler-windows": "^20221004.0.0", "google-closure-compiler-windows": "^20240317.0.0",
"minimist": "1.x", "minimist": "1.x",
"vinyl": "2.x", "vinyl": "2.x",
"vinyl-sourcemaps-apply": "^0.2.0" "vinyl-sourcemaps-apply": "^0.2.0"
} }
}, },
"google-closure-compiler-java": { "google-closure-compiler-java": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20240317.0.0.tgz",
"integrity": "sha512-CygLEB40HxtK0VtP6klv2Xm08w4HQNYX/DTgLV7CP74r8LiQMUByRFleaG/Hv5xQG1JzPNiW0GOAiAubDSdr5A==", "integrity": "sha512-oWURPChjcCrVfiQOuVtpSoUJVvtOYo41JGEQ2qtArsTGmk/DpWh40vS6hitwKRM/0YzJX/jYUuyt9ibuXXJKmg==",
"dev": true "dev": true
}, },
"google-closure-compiler-linux": { "google-closure-compiler-linux": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20240317.0.0.tgz",
"integrity": "sha512-B6sca3Lmw3cYXdFzdU0iQpk8L9VEo1ecC1aM7Gl9lgWhIicqqEZebsgnUe5TQ3uHBfQoKjV9fdFG8mt8X/oqSQ==", "integrity": "sha512-dYLtcbbJdbbBS0lTy9SzySdVv/aGkpyTekQiW4ADhT/i1p1b4r0wQTKj6kpVVmFvbZ6t9tW/jbXc9EXXNUahZw==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"google-closure-compiler-osx": { "google-closure-compiler-osx": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20240317.0.0.tgz",
"integrity": "sha512-z5V7BvaMauPga8DMTt9u6RGcjBdLAuv4gL2Ebw5NIQRTAHVkEVzCd3kiMX7CVCGhmWdS/1r3jZcCg4BswGia6w==", "integrity": "sha512-0mABwjD4HP11rikFd8JRIb9OgPqn9h3o3wS0otufMfmbwS7zRpnnoJkunifhORl3VoR1gFm6vcTC9YziTEFdOw==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"google-closure-compiler-windows": { "google-closure-compiler-windows": {
"version": "20221004.0.0", "version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20221004.0.0.tgz", "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20240317.0.0.tgz",
"integrity": "sha512-JSAWilVa7d65QJYKUr+DmklwKmjkAce6BMD6smqJfdL2dv5OSJ2ydGy73euoBJ4Tka8iQPoaOP+BjLrhIuvqKg==", "integrity": "sha512-fTueVFzNOWURFlXZmrFkAB7yA+jzpA2TeDOYeBEFwVlVGHwi8PV3Q9vCIWlbkE8wLpukKEg5wfRHYrLwVPINCA==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },

View File

@@ -26,7 +26,7 @@
"css-minimizer-webpack-plugin": "^1.3.0", "css-minimizer-webpack-plugin": "^1.3.0",
"exports-loader": "^1.1.1", "exports-loader": "^1.1.1",
"find-package-json": "^1.2.0", "find-package-json": "^1.2.0",
"google-closure-compiler": "20221004.0.0", "google-closure-compiler": "20240317.0.0",
"html-webpack-plugin": "^4.5.2", "html-webpack-plugin": "^4.5.2",
"mini-css-extract-plugin": "^1.6.2", "mini-css-extract-plugin": "^1.6.2",
"webpack": "^4.47.0", "webpack": "^4.47.0",