GUACAMOLE-1905: Update Java dependencies to latest compatible versions.

This commit is contained in:
Virtually Nick
2024-03-03 15:01:32 -05:00
parent 4c24bfd18d
commit fddcdd39f9
75 changed files with 86 additions and 72 deletions

View File

@@ -0,0 +1,5 @@
Apache Commons Codec
Copyright 2002-2024 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

View File

@@ -0,0 +1,8 @@
Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
-----------------------------------------------------------------------
Version: 1.16.1
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1 +0,0 @@
org.apache.santuario:xmlsec:jar:2.2.6

View File

@@ -1,5 +1,5 @@
Apache Santuario - XML Security for Java
Copyright 1999-2022 The Apache Software Foundation
Copyright 1999-2024 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

View File

@@ -1,7 +1,7 @@
Apache Santuario (https://santuario.apache.org/)
-------------------------------------------------
Version: 2.2.6
Version: 2.3.4
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.santuario:xmlsec:jar:2.3.4

View File

@@ -1 +0,0 @@
org.apache.directory.api:api-all:jar:2.1.5

View File

@@ -1,7 +1,7 @@
Apache Directory LDAP API (http://directory.apache.org)
-------------------------------------------------------
Version: 2.1.5
Version: 2.1.6
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.apache.directory.api:api-all:jar:2.1.6

View File

@@ -1 +0,0 @@
com.github.seancfoley:ipaddress:jar:5.4.0

View File

@@ -1,7 +1,7 @@
IPAddress (https://seancfoley.github.io/IPAddress/)
---------------------------------------------------
Version: 5.4.0
Version: 5.5.0
From: 'Sean C Foley' (https://seancfoley.github.io/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
com.github.seancfoley:ipaddress:jar:5.5.0

View File

@@ -1,7 +1,7 @@
Jackson (https://github.com/FasterXML/jackson)
----------------------------------------------
Version: 2.16.0
Version: 2.16.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.16.0
com.fasterxml.jackson.core:jackson-annotations:jar:2.16.0
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.16.0
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.0
com.fasterxml.jackson.core:jackson-core:jar:2.16.1
com.fasterxml.jackson.core:jackson-annotations:jar:2.16.1
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.16.1
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.16.1

View File

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

View File

@@ -1,7 +1,7 @@
Jackson-databind (https://github.com/FasterXML/jackson-databind)
----------------------------------------------
Version: 2.16.0
Version: 2.16.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.16.1

View File

@@ -1 +0,0 @@
org.bitbucket.b_c:jose4j:jar:0.9.3

View File

@@ -1,5 +1,5 @@
jose4j
Copyright 2012-2015 Brian Campbell
Copyright 2012-2024 Brian Campbell
EcdsaUsingShaAlgorithm contains code for converting the concatenated
R & S values of the signature to and from DER, which was originally

View File

@@ -1,7 +1,7 @@
jose.4.j (https://bitbucket.org/b_c/jose4j/)
--------------------------------------------
Version: 0.9.3
Version: 0.9.5
From: 'Brian Campbell' (https://bitbucket.org/b_c/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
org.bitbucket.b_c:jose4j:jar:0.9.5

View File

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

View File

@@ -1,7 +1,7 @@
Kotlin (https://kotlinlang.org/)
--------------------------------
Version: 1.9.21
Version: 1.9.22
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.9.22
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.22
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.22

View File

@@ -1,2 +0,0 @@
kotlinx.serialization library.
Copyright 2017-2019 JetBrains s.r.o and respective authors and developers

View File

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

View File

@@ -0,0 +1,2 @@
kotlinx.serialization library.
Copyright 2017-2023 JetBrains s.r.o and respective authors and developers

View File

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

View File

@@ -0,0 +1,2 @@
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 +0,0 @@
com.keepersecurity.secrets-manager:core:jar:16.6.2

View File

@@ -1,6 +1,6 @@
MIT License
Copyright (c) 2021 Keeper Security
Copyright (c) 2023 Keeper Security
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

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

View File

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

View File

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

View File

@@ -2,7 +2,7 @@ Logback LICENSE
---------------
Logback: the reliable, generic, fast and flexible logging framework.
Copyright (C) 1999-2015, QOS.ch. All rights reserved.
Copyright (C) 1999-2024, QOS.ch. All rights reserved.
This program and the accompanying materials are dual-licensed under
either the terms of the Eclipse Public License v1.0 as published by

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
Copyright (c) 2004-2024 QOS.ch Sarl (Switzerland)
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining

View File

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

View File

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

View File

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

View File

@@ -1 +0,0 @@
com.fasterxml.woodstox:woodstox-core:jar:5.4.0

View File

@@ -1,7 +1,7 @@
Woodstox Core (https://github.com/FasterXML/woodstox)
------------------------------------------------------
Version: 5.4.0
Version: 6.5.0
From: 'FasterXML, LLC' (http://fasterxml.com/)
License(s):
Apache v2.0

View File

@@ -0,0 +1 @@
com.fasterxml.woodstox:woodstox-core:jar:6.5.0

View File

@@ -1,8 +1,8 @@
Woodstox Stax2-API (https://github.com/FasterXML/stax2-api)
------------------------------------------------------------
Version: 4.2
Version: 4.2.1
From: 'FasterXML, LLC' (http://fasterxml.com/)
License(s):
BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE)
BSD Simplified (bundled/woodstox-stax2-api-4.2.1/LICENSE)

View File

@@ -0,0 +1 @@
org.codehaus.woodstox:stax2-api:jar:4.2.1

View File

@@ -1 +0,0 @@
org.codehaus.woodstox:stax2-api:jar:4.2

View File

@@ -1,2 +0,0 @@
com.google.zxing:core:jar:3.5.2
com.google.zxing:javase:jar:3.5.2

View File

@@ -1,7 +1,7 @@
ZXing Barcode Scanning Library (https://github.com/zxing/zxing/)
----------------------------------------------------------------
Version: 3.5.2
Version: 3.5.3
From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.2/AUTHORS)
License(s):
Apache v2.0

View File

@@ -0,0 +1,2 @@
com.google.zxing:core:jar:3.5.3
com.google.zxing:javase:jar:3.5.3

View File

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

View File

@@ -77,7 +77,7 @@
<dependency>
<groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId>
<version>5.4.0</version>
<version>5.5.0</version>
</dependency>
<!-- JUnit -->

View File

@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.1.5</version>
<version>2.1.6</version>
<exclusions>
<!--

View File

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

View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>0.9.3</version>
<version>0.9.5</version>
</dependency>
<!-- Guice -->

View File

@@ -122,14 +122,14 @@
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>5.4.0</version>
<version>6.5.0</version>
</dependency>
<!-- Apache XML Security for Java (see exclusions for java-saml) -->
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>2.2.6</version>
<version>2.3.4</version>
<exclusions>
<!--
@@ -157,7 +157,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.0</version>
<version>1.16.1</version>
</dependency>
</dependencies>

View File

@@ -162,12 +162,12 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
</dependency>
<!-- Guacamole depends on an implementation of JAX-WS -->

View File

@@ -38,7 +38,7 @@
</parent>
<properties>
<kotlin.version>1.9.21</kotlin.version>
<kotlin.version>1.9.22</kotlin.version>
</properties>
<dependencies>
@@ -60,7 +60,7 @@
<dependency>
<groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId>
<version>16.6.2</version>
<version>16.6.3</version>
<!-- Correct version conflict (different versions across transitive
dependencies) -->

10
pom.xml
View File

@@ -39,13 +39,13 @@
<guava.version>32.1.3-jre</guava.version>
<guice.version>5.1.0</guice.version>
<hk2.version>2.6.1</hk2.version>
<jackson.version>2.16.0</jackson.version>
<jackson-databind.version>2.16.0</jackson-databind.version>
<jackson.version>2.16.1</jackson.version>
<jackson-databind.version>2.16.1</jackson-databind.version>
<jersey.version>2.41</jersey.version>
<junit.version>5.10.1</junit.version>
<junit.version>5.10.2</junit.version>
<junit4.version>4.13.2</junit4.version>
<logback.version>1.3.14</logback.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.5.2</logback.version>
<slf4j.version>2.0.12</slf4j.version>
<!-- The directory that should receive all generated dependency lists
(for LICENSE generation) -->