-
Notifications
You must be signed in to change notification settings - Fork 722
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GUACAMOLE-1807: Merge update to latest compatible versions for Java d…
…ependencies and JDBC drivers.
- Loading branch information
Showing
53 changed files
with
173 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
Caffeine (https://github.com/ben-manes/caffeine) | ||
------------------------------------------------ | ||
|
||
Version: 2.9.3 | ||
From: 'Ben Manes' (https://github.com/ben-manes) | ||
License(s): | ||
Apache v2.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
com.github.ben-manes.caffeine:caffeine:jar:2.9.3 |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
doc/licenses/checker-qual-3.12.0/README → doc/licenses/checker-qual-3.33.0/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
Checker Framework qualifiers (https://checkerframework.org/) | ||
------------------------------------------------------------ | ||
|
||
Version: 3.12.0 | ||
Version: 3.33.0 | ||
From: 'Checker Framework developers' (https://checkerframework.org/) | ||
License(s): | ||
MIT (bundled/checker-qual-3.12.0/LICENSE.txt) | ||
MIT (bundled/checker-qual-3.33.0/LICENSE.txt) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.checkerframework:checker-qual:jar:3.33.0 |
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
doc/licenses/directory-api-2.1.2/NOTICE → doc/licenses/directory-api-2.1.3/NOTICE
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
Apache Directory LDAP API | ||
Copyright 2003-2021 The Apache Software Foundation | ||
Copyright 2003-2022 The Apache Software Foundation | ||
|
||
This product includes software developed at | ||
The Apache Software Foundation (http://www.apache.org/). |
2 changes: 1 addition & 1 deletion
2
doc/licenses/directory-api-2.1.2/README → doc/licenses/directory-api-2.1.3/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.apache.directory.api:api-all:jar:2.1.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Copyright 2001-2016 (C) MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved. | ||
Copyright 2001-2023 © MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved. | ||
|
||
Redistribution and use of this software and associated documentation | ||
("Software"), with or without modification, are permitted provided | ||
|
@@ -7,24 +7,24 @@ that the following conditions are met: | |
1. Redistributions of source code must retain copyright | ||
statements and notices. Redistributions must also contain a | ||
copy of this document. | ||
|
||
2. Redistributions in binary form must reproduce the | ||
above copyright notice, this list of conditions and the | ||
following disclaimer in the documentation and/or other | ||
materials provided with the distribution. | ||
|
||
3. The name "DOM4J" must not be used to endorse or promote | ||
products derived from this Software without prior written | ||
permission of MetaStuff, Ltd. For written permission, | ||
please contact [email protected]. | ||
|
||
4. Products derived from this Software may not be called "DOM4J" | ||
nor may "DOM4J" appear in their names without prior written | ||
permission of MetaStuff, Ltd. DOM4J is a registered | ||
trademark of MetaStuff, Ltd. | ||
|
||
5. Due credit should be given to the DOM4J Project - https://dom4j.github.io/ | ||
|
||
THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS | ||
``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT | ||
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
|
4 changes: 2 additions & 2 deletions
4
doc/licenses/dom4j-2.1.3/README → doc/licenses/dom4j-2.1.4/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
DOM4J (https://dom4j.github.io/) | ||
-------------------------------- | ||
|
||
Version: 2.1.3 | ||
Version: 2.1.4 | ||
From: 'MetaStuff, Ltd. and DOM4J contributors' | ||
License(s): | ||
DOM4J License (bundled/dom4j-2.1.3/LICENSE) | ||
DOM4J License (bundled/dom4j-2.1.4/LICENSE) | ||
|
2 changes: 1 addition & 1 deletion
2
doc/licenses/dom4j-2.1.3/dep-coordinates.txt → doc/licenses/dom4j-2.1.4/dep-coordinates.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:2.1.3_1 | ||
org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:2.1.4_1 |
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
doc/licenses/error-prone-2.11.0/README → doc/licenses/error-prone-2.18.0/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
com.google.errorprone:error_prone_annotations:jar:2.18.0 |
2 changes: 1 addition & 1 deletion
2
doc/licenses/guava-31.1-jre/README → doc/licenses/guava-32.1.1-jre/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...censes/guava-31.1-jre/dep-coordinates.txt → ...nses/guava-32.1.1-jre/dep-coordinates.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
com.google.guava:failureaccess:jar:1.0.1 | ||
com.google.guava:guava:jar:31.1-jre | ||
com.google.guava:guava:jar:32.1.1-jre | ||
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava |
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
doc/licenses/j2objc-annotations-1.3/README → doc/licenses/j2objc-annotations-2.8/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
com.google.j2objc:j2objc-annotations:jar:2.8 |
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
doc/licenses/jackson-2.15.0/README → doc/licenses/jackson-2.15.2/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...censes/jackson-2.15.0/dep-coordinates.txt → ...censes/jackson-2.15.2/dep-coordinates.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
com.fasterxml.jackson.core:jackson-core:jar:2.15.0 | ||
com.fasterxml.jackson.core:jackson-annotations:jar:2.15.0 | ||
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.0 | ||
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.0 | ||
com.fasterxml.jackson.core:jackson-core:jar:2.15.2 | ||
com.fasterxml.jackson.core:jackson-annotations:jar:2.15.2 | ||
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.15.2 | ||
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.2 |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
doc/licenses/jackson-databind-2.15.0/README → doc/licenses/jackson-databind-2.15.2/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
com.fasterxml.jackson.core:jackson-databind:jar:2.15.2 |
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
doc/licenses/javassist-3.29.0-ga/README → doc/licenses/javassist-3.29.2-ga/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.javassist:javassist:jar:3.29.2-GA |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
doc/licenses/jersey-2.39.1/README → doc/licenses/jersey-2.40/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
Jersey (https://jersey.java.net/) | ||
--------------------------------- | ||
|
||
Version: 2.39.1 | ||
Version: 2.40 | ||
From: 'Eclipse Foundation' (https://www.eclipse.org/) | ||
License(s): | ||
EPL v2.0 (bundled/jersey-2.39.1/LICENSE.md) | ||
EPL v2.0 (bundled/jersey-2.40/LICENSE.md) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.40 | ||
org.glassfish.jersey.core:jersey-common:jar:2.40 | ||
org.glassfish.jersey.core:jersey-server:jar:2.40 | ||
org.glassfish.jersey.core:jersey-client:jar:2.40 | ||
org.glassfish.jersey.inject:jersey-hk2:jar:2.40 | ||
org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.40 | ||
org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.40 |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
doc/licenses/kotlin-1.8.20/README → doc/licenses/kotlin-1.9.0/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
org.jetbrains.kotlin:kotlin-reflect:jar:1.9.0 | ||
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.0 | ||
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.0 | ||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.0 | ||
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.0 |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
com.keepersecurity.secrets-manager:core:jar:16.5.4 |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
doc/licenses/logback-1.3.7/README → doc/licenses/logback-1.3.8/README
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
Logback (http://logback.qos.ch/) | ||
-------------------------------- | ||
|
||
Version: 1.3.7 | ||
Version: 1.3.8 | ||
From: 'QOS.ch Sàrl' (http://qos.ch/) | ||
License(s): | ||
EPL v1.0 (bundled/logback-1.3.7/LICENSE.txt) | ||
EPL v1.0 (bundled/logback-1.3.8/LICENSE.txt) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ch.qos.logback:logback-classic:jar:1.3.8 | ||
ch.qos.logback:logback-core:jar:1.3.8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.