Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUACAMOLE-1956: Update to latest compatible dependency versions. #991

Merged
merged 2 commits into from
Jun 11, 2024
Merged

GUACAMOLE-1956: Update to latest compatible dependency versions. #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94988d9
GUACAMOLE-1956: Upgrade to latest compatible NPM dependencies.
jmuehlner Jun 3, 2024
429d968
GUACAMOLE-1956: Update maven dependencies to latest compatible versions.
jmuehlner Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/guacamole-example/pom.xml
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

0 doc/licenses/apache-commons-1.16.1/NOTICE → doc/licenses/apache-commons-1.17.0/NOTICE
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/licenses/apache-commons-1.16.1/README → doc/licenses/apache-commons-1.17.0/README
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

0 ...icenses/bouncycastle-fips-1.0.2.4/LICENSE → ...icenses/bouncycastle-fips-1.0.2.5/LICENSE
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...licenses/bouncycastle-fips-1.0.2.4/README → ...licenses/bouncycastle-fips-1.0.2.5/README
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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

1 change: 1 addition & 0 deletions doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

0 ...es/kotlinx-serialization-1.6.0/NOTICE.txt → ...es/kotlinx-serialization-1.6.3/NOTICE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...censes/kotlinx-serialization-1.6.0/README → ...censes/kotlinx-serialization-1.6.3/README
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

0 doc/licenses/ksm-sdk-16.6.3/LICENSE → doc/licenses/ksm-sdk-16.6.4/LICENSE
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions doc/licenses/ksm-sdk-16.6.3/README → doc/licenses/ksm-sdk-16.6.4/README
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

0 doc/licenses/mybatis-3.5.15/NOTICE → doc/licenses/mybatis-3.5.16/NOTICE
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/licenses/mybatis-3.5.15/README → doc/licenses/mybatis-3.5.16/README
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.mybatis:mybatis:jar:3.5.16
2 changes: 1 addition & 1 deletion extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
View file
Open in desktop
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
78 changes: 39 additions & 39 deletions guacamole/src/main/frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion guacamole/src/main/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"css-minimizer-webpack-plugin": "^1.3.0",
"exports-loader": "^1.1.1",
"find-package-json": "^1.2.0",
"google-closure-compiler": "20221004.0.0",
"google-closure-compiler": "20240317.0.0",
"html-webpack-plugin": "^4.5.2",
"mini-css-extract-plugin": "^1.6.2",
"webpack": "^4.47.0",
Expand Down