Skip to content

Commit

Permalink
Merge 1.5.5 changes back to main.
Browse files Browse the repository at this point in the history
  • Loading branch information
necouchman committed Mar 9, 2024
2 parents c257a57 + bdfe030 commit 5843c67
Show file tree
Hide file tree
Showing 81 changed files with 145 additions and 101 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ ARG MAVEN_ARGUMENTS="-DskipTests=false"

# Versions of JDBC drivers to bundle within image
ARG MSSQL_JDBC_VERSION=9.4.1
ARG MYSQL_JDBC_VERSION=8.0.33
ARG PGSQL_JDBC_VERSION=42.6.0
ARG MYSQL_JDBC_VERSION=8.3.0
ARG PGSQL_JDBC_VERSION=42.7.2

# Build environment variables
ENV \
Expand Down
3 changes: 0 additions & 3 deletions doc/licenses/angular-translate-2.19.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
angular-translate (https://angular-translate.github.io/)
--------------------------------------------------------

Version: 2.19.0
Version: 2.19.1
From: 'Pascal Precht' (https://github.com/PascalPrecht)
License(s):
MIT (bundled/angular-translate-2.19.0/LICENSE)
MIT (bundled/angular-translate-2.19.1/LICENSE)

3 changes: 3 additions & 0 deletions doc/licenses/angular-translate-2.19.1/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
angular-translate-interpolation-messageformat:2.19.1
angular-translate-loader-static-files:2.19.1
angular-translate:2.19.1
5 changes: 5 additions & 0 deletions doc/licenses/apache-commons-1.16.1/NOTICE
Original file line number Diff line number Diff line change
@@ -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/).
8 changes: 8 additions & 0 deletions doc/licenses/apache-commons-1.16.1/README
Original file line number Diff line number Diff line change
@@ -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

1 change: 1 addition & 0 deletions doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
commons-codec:commons-codec:jar:1.16.1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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/).
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.commons:commons-text:jar:1.11.0
1 change: 0 additions & 1 deletion doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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/).
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/apache-santuario-2.3.4/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.santuario:xmlsec:jar:2.3.4
1 change: 0 additions & 1 deletion doc/licenses/directory-api-2.1.5/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 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
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/directory-api-2.1.6/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.directory.api:api-all:jar:2.1.6
1 change: 0 additions & 1 deletion doc/licenses/ipaddress-5.4.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/ipaddress-5.5.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.github.seancfoley:ipaddress:jar:5.5.0
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion doc/licenses/jackson-databind-2.16.0/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 @@
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
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/jackson-databind-2.16.1/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.fasterxml.jackson.core:jackson-databind:jar:2.16.1
1 change: 0 additions & 1 deletion doc/licenses/jose4j-0.9.3/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/jose4j-0.9.5/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.bitbucket.b_c:jose4j:jar:0.9.5
5 changes: 0 additions & 5 deletions doc/licenses/kotlin-1.9.21/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 @@
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
Expand Down
5 changes: 5 additions & 0 deletions doc/licenses/kotlin-1.9.22/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions doc/licenses/kotlinx-serialization-1.3.3/NOTICE.txt

This file was deleted.

2 changes: 0 additions & 2 deletions doc/licenses/kotlinx-serialization-1.3.3/dep-coordinates.txt

This file was deleted.

2 changes: 2 additions & 0 deletions doc/licenses/kotlinx-serialization-1.6.0/NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
kotlinx.serialization library.
Copyright 2017-2023 JetBrains s.r.o and respective authors and developers
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions doc/licenses/kotlinx-serialization-1.6.0/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.0
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.0
1 change: 0 additions & 1 deletion doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
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.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)

1 change: 1 addition & 0 deletions doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.6.3
17 changes: 17 additions & 0 deletions doc/licenses/logback-1.5.2/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Logback LICENSE
---------------

Logback: the reliable, generic, fast and flexible logging framework.
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
the Eclipse Foundation

or (per the licensee's choosing)

under the terms of the GNU Lesser General Public License version 2.1
as published by the Free Software Foundation.

** ECLIPSE PUBLIC LICENSE v1.0 CHOSEN. **

8 changes: 8 additions & 0 deletions doc/licenses/logback-1.5.2/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Logback (http://logback.qos.ch/)
--------------------------------

Version: 1.5.2
From: 'QOS.ch Sàrl' (http://qos.ch/)
License(s):
EPL v1.0 (bundled/logback-1.5.2/LICENSE.txt)

2 changes: 2 additions & 0 deletions doc/licenses/logback-1.5.2/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ch.qos.logback:logback-classic:jar:1.5.2
ch.qos.logback:logback-core:jar:1.5.2
1 change: 0 additions & 1 deletion doc/licenses/mybatis-3.5.14/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.14
Version: 3.5.15
From: 'MyBatis' (http://www.mybatis.org/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/mybatis-3.5.15/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.mybatis:mybatis:jar:3.5.15
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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)

2 changes: 2 additions & 0 deletions doc/licenses/slf4j-api-2.0.12/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
org.slf4j:jul-to-slf4j:jar:2.0.12
org.slf4j:slf4j-api:jar:2.0.12
2 changes: 0 additions & 2 deletions doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt

This file was deleted.

1 change: 0 additions & 1 deletion doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/woodstox-core-6.5.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.fasterxml.woodstox:woodstox-core:jar:6.5.0
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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)

1 change: 1 addition & 0 deletions doc/licenses/woodstox-stax2-api-4.2.1/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.codehaus.woodstox:stax2-api:jar:4.2.1
1 change: 0 additions & 1 deletion doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt

This file was deleted.

2 changes: 0 additions & 2 deletions doc/licenses/zxing-3.5.2/dep-coordinates.txt

This file was deleted.

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions doc/licenses/zxing-3.5.3/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
com.google.zxing:core:jar:3.5.3
com.google.zxing:javase:jar:3.5.3
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.14</version>
<version>3.5.15</version>
</dependency>

<!-- MyBatis Guice -->
Expand Down
2 changes: 1 addition & 1 deletion extensions/guacamole-auth-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
2 changes: 1 addition & 1 deletion extensions/guacamole-auth-ldap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<!--
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.0</version>
<version>1.16.1</version>
</dependency>

</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
Loading

0 comments on commit 5843c67

Please sign in to comment.