Skip to content

Commit

Permalink
GUACAMOLE-1956: Update maven dependencies to latest compatible versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmuehlner committed Jun 11, 2024
1 parent 94988d9 commit 429d968
Show file tree
Hide file tree
Showing 29 changed files with 41 additions and 21 deletions.
2 changes: 1 addition & 1 deletion doc/guacamole-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.7</version>
<version>2.0.13</version>
</dependency>


Expand Down
1 change: 0 additions & 1 deletion doc/licenses/apache-commons-1.16.1/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/apache-commons-1.17.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
commons-codec:commons-codec:jar:1.17.0
1 change: 0 additions & 1 deletion doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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)
License(s):
MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE)
MIT (bundled/bouncycastle-fips-1.0.2.5/LICENSE)

1 change: 1 addition & 0 deletions doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.bouncycastle:bc-fips:jar:1.0.2.5
11 changes: 11 additions & 0 deletions doc/licenses/jakarta-validation-api-2.1.3/NOTICE
Original file line number Diff line number Diff line change
@@ -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.

8 changes: 8 additions & 0 deletions doc/licenses/jakarta-validation-api-2.1.3/README
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jakarta.validation:jakarta.validation-api:jar:2.1.3
2 changes: 0 additions & 2 deletions doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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'
License(s):
Apache v2.0
Expand Down
2 changes: 2 additions & 0 deletions doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
(https://github.com/Keeper-Security/secrets-manager)
----------------------------------------------------

Version: 16.6.3
Version: 16.6.4
From: 'Keeper Security' (https://www.keepersecurity.com/)
License(s):
MIT (bundled/ksm-sdk-16.6.3/LICENSE)
MIT (bundled/ksm-sdk-16.6.4/LICENSE)

1 change: 1 addition & 0 deletions doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.6.4
1 change: 0 additions & 1 deletion doc/licenses/mybatis-3.5.15/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MyBatis (http://www.mybatis.org/mybatis-3/)
-------------------------------------------

Version: 3.5.15
Version: 3.5.16
From: 'MyBatis' (http://www.mybatis.org/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/mybatis-3.5.16/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.mybatis:mybatis:jar:3.5.16
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.5.15</version>
<version>3.5.16</version>
</dependency>

<!-- MyBatis Guice -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
<version>1.17.0</version>
</dependency>

</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<!--
Replace slightly older commons-codec (1.15) with newer
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.
-->
<exclusion>
Expand All @@ -157,7 +157,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.1</version>
<version>1.17.0</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion extensions/guacamole-auth-totp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0</version>
<version>2.1.1</version>
<scope>provided</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>com.keepersecurity.secrets-manager</groupId>
<artifactId>core</artifactId>
<version>16.6.3</version>
<version>16.6.4</version>

<!-- Correct version conflict (different versions across transitive
dependencies) -->
Expand Down Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>1.0.2.4</version>
<version>1.0.2.5</version>
</dependency>

</dependencies>
Expand Down

0 comments on commit 429d968

Please sign in to comment.