Skip to content

Commit

Permalink
Merge branch 'apache:main' into jira/1881
Browse files Browse the repository at this point in the history
  • Loading branch information
josnabattula committed Apr 7, 2024
2 parents a9311cf + 0e12f48 commit 26f2116
Show file tree
Hide file tree
Showing 235 changed files with 2,962 additions and 2,281 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
6 changes: 3 additions & 3 deletions doc/guacamole-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-example</artifactId>
<packaging>war</packaging>
<version>1.5.4</version>
<version>1.5.5</version>
<name>guacamole-example</name>
<url>http://guacamole.apache.org/</url>

Expand Down Expand Up @@ -106,15 +106,15 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>
<scope>compile</scope>
</dependency>

<!-- Guacamole JavaScript library -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions doc/guacamole-playback-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-playback-example</artifactId>
<packaging>war</packaging>
<version>1.5.4</version>
<version>1.5.5</version>
<name>guacamole-playback-example</name>
<url>http://guacamole.apache.org/</url>

Expand Down Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>1.5.4</version>
<version>1.5.5</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
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
17 changes: 17 additions & 0 deletions doc/licenses/apache-commons-codec-1.11/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Apache Commons Codec
Copyright 2002-2020 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
contains test data from http://aspell.net/test/orig/batch0.tab.
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)

===============================================================================

The content of package org.apache.commons.codec.language.bm has been translated
from the original php source code available at http://stevemorse.org/phoneticinfo.htm
with permission from the original authors.
Original source copyright:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
8 changes: 8 additions & 0 deletions doc/licenses/apache-commons-codec-1.11/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.11
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

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

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: 1 addition & 0 deletions doc/licenses/byte-buddy-1.14.9/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Copyright 2014 - Present Rafael Winterhalter
8 changes: 8 additions & 0 deletions doc/licenses/byte-buddy-1.14.9/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Byte Buddy (https://bytebuddy.net/)
-----------------------------------

Version: 1.14.9
From: 'Rafael Winterhalter' (https://github.com/raphw)
License(s):
Apache v2.0

1 change: 1 addition & 0 deletions doc/licenses/byte-buddy-1.14.9/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
net.bytebuddy:byte-buddy:jar:1.14.9
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
25 changes: 25 additions & 0 deletions doc/licenses/duo-universal-sdk-1.1.3/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Copyright (c) 2022 Cisco Systems, Inc. and/or its affiliates
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
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 of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8 changes: 8 additions & 0 deletions doc/licenses/duo-universal-sdk-1.1.3/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Duo Universal SDK for Java (https://duo.com/docs/duoweb)
--------------------------------------------------------

Version: 1.1.3
From: 'Cisco Systems'
License(s):
Duo License (bundled/duo-universal-sdk-1.1.3/LICENSE)

1 change: 1 addition & 0 deletions doc/licenses/duo-universal-sdk-1.1.3/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.duosecurity:duo-universal-sdk:jar:1.1.3
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.17.0
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.17.0
com.fasterxml.jackson.core:jackson-annotations:jar:2.17.0
com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.17.0
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.17.0
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.17.0
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.17.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.fasterxml.jackson.core:jackson-databind:jar:2.17.0
21 changes: 21 additions & 0 deletions doc/licenses/java-jwt-3.3.0/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2015 Auth0, Inc. <support@auth0.com> (http://auth0.com)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
8 changes: 8 additions & 0 deletions doc/licenses/java-jwt-3.3.0/README
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Java JWT (https://github.com/auth0/java-jwt)
--------------------------------------------

Version: 3.3.0
From: 'Auth0 by Okta' (https://www.auth0.com)
License(s):
MIT (bundled/java-jwt-3.3.0/LICENSE)

1 change: 1 addition & 0 deletions doc/licenses/java-jwt-3.3.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.auth0:java-jwt:jar:3.3.0
1 change: 0 additions & 1 deletion doc/licenses/javassist-3.29.2-ga/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Javassist (https://www.javassist.org/)
--------------------------------------

Version: 3.29.2-GA
Version: 3.30.2-GA
From: 'Shigeru Chiba' (https://github.com/chibash)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/javassist-3.30.2-ga/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.javassist:javassist:jar:3.30.2-GA
Loading

0 comments on commit 26f2116

Please sign in to comment.