Skip to content

Commit

Permalink
Merge branch 'apache:master' into jira/1881
Browse files Browse the repository at this point in the history
  • Loading branch information
josnabattula committed Jan 15, 2024
2 parents f071bb1 + ddf9e72 commit ca241ab
Show file tree
Hide file tree
Showing 126 changed files with 785 additions and 489 deletions.
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.3</version>
<version>1.5.4</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.3</version>
<version>1.5.4</version>
<scope>compile</scope>
</dependency>

<!-- Guacamole JavaScript library -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>1.5.3</version>
<version>1.5.4</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.3</version>
<version>1.5.4</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.3</version>
<version>1.5.4</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
Expand Down
5 changes: 5 additions & 0 deletions doc/licenses/apache-commons-1.16.0/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Apache Commons Codec
Copyright 2002-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 Codec (http://commons.apache.org/proper/commons-codec/)
-----------------------------------------------------------------------

Version: 1.15
Version: 1.16.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.16.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
commons-codec:commons-codec:jar:1.16.0
17 changes: 0 additions & 17 deletions doc/licenses/apache-commons-codec-1.15/NOTICE

This file was deleted.

1 change: 0 additions & 1 deletion doc/licenses/apache-commons-codec-1.15/dep-coordinates.txt

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Commons Lang
Copyright 2001-2021 The Apache Software Foundation
Copyright 2001-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 Lang (http://commons.apache.org/proper/commons-lang/)
--------------------------------------------------------------------

Version: 3.12.0
Version: 3.14.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-lang3:jar:3.14.0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Apache Commons Pool
Copyright 2001-2021 The Apache Software Foundation
Copyright 2001-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 Pool (http://commons.apache.org/proper/commons-pool/)
--------------------------------------------------------------------

Version: 2.11.1
Version: 2.12.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-pool2:jar:2.12.0
1 change: 0 additions & 1 deletion doc/licenses/apache-mina-2.2.2/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 Mina (https://mina.apache.org/)
--------------------------------------

Version: 2.2.2
Version: 2.2.3
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/apache-mina-2.2.3/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.mina:mina-core:jar:2.2.3
1 change: 0 additions & 1 deletion doc/licenses/apache-santuario-2.2.3/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-2021 The Apache Software Foundation
Copyright 1999-2022 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Expand All @@ -10,3 +10,5 @@ Data Communications Systems, <http://www.nue.et-inf.uni-siegen.de/>.
The development of this software was partly funded by the European
Commission in the <WebSig> project in the ISIS Programme.

This product contains software that is
copyright (c) 2021, Oracle and/or its affiliates.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Apache Santuario (https://santuario.apache.org/)
-------------------------------------------------

Version: 2.2.3
Version: 2.2.6
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.2.6/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.santuario:xmlsec:jar:2.2.6
1 change: 0 additions & 1 deletion doc/licenses/checker-qual-3.33.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Checker Framework qualifiers (https://checkerframework.org/)
------------------------------------------------------------

Version: 3.33.0
Version: 3.37.0
From: 'Checker Framework developers' (https://checkerframework.org/)
License(s):
MIT (bundled/checker-qual-3.33.0/LICENSE.txt)
MIT (bundled/checker-qual-3.37.0/LICENSE.txt)

1 change: 1 addition & 0 deletions doc/licenses/checker-qual-3.37.0/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.checkerframework:checker-qual:jar:3.37.0
1 change: 0 additions & 1 deletion doc/licenses/directory-api-2.1.4/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.4
Version: 2.1.5
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.5/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.5
1 change: 0 additions & 1 deletion doc/licenses/error-prone-2.18.0/dep-coordinates.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Error Prone (https://errorprone.info/)
--------------------------------------

Version: 2.18.0
Version: 2.21.1
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/error-prone-2.21.1/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.google.errorprone:error_prone_annotations:jar:2.21.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Guava: Google Core Libraries for Java (https://github.com/google/guava)
-----------------------------------------------------------------------

Version: 32.1.2-jre
Version: 32.1.3-jre
From: 'Google Inc.' (http://www.google.com/)
License(s):
Apache v2.0
Expand Down
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:32.1.2-jre
com.google.guava:guava:jar:32.1.3-jre
com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava
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.15.2
Version: 2.16.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.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
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
1 change: 0 additions & 1 deletion doc/licenses/jackson-databind-2.15.2/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.15.2
Version: 2.16.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.16.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.16.0
7 changes: 0 additions & 7 deletions doc/licenses/jersey-2.40/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Jersey (https://jersey.java.net/)
---------------------------------

Version: 2.40
Version: 2.41
From: 'Eclipse Foundation' (https://www.eclipse.org/)
License(s):
EPL v2.0 (bundled/jersey-2.40/LICENSE.md)
EPL v2.0 (bundled/jersey-2.41/LICENSE.md)

7 changes: 7 additions & 0 deletions doc/licenses/jersey-2.41/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.41
org.glassfish.jersey.core:jersey-common:jar:2.41
org.glassfish.jersey.core:jersey-server:jar:2.41
org.glassfish.jersey.core:jersey-client:jar:2.41
org.glassfish.jersey.inject:jersey-hk2:jar:2.41
org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.41
org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.41
5 changes: 0 additions & 5 deletions doc/licenses/kotlin-1.9.10/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.10
Version: 1.9.21
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.21/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.21
org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.21
org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.21
org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.21
org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.21
2 changes: 0 additions & 2 deletions doc/licenses/logback-1.3.11/dep-coordinates.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Logback (http://logback.qos.ch/)
--------------------------------

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

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/
-----------------------------------------------------

Version: 2.0
Version: 2.2
From: 'Andrey Somov' (https://bitbucket.org/asomov/)
License(s):
Apache v2.0
Expand Down
1 change: 1 addition & 0 deletions doc/licenses/snakeyaml-2.2/dep-coordinates.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.yaml:snakeyaml:jar:2.2
6 changes: 3 additions & 3 deletions extensions/guacamole-auth-ban/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-ban</artifactId>
<packaging>jar</packaging>
<version>1.5.3</version>
<version>1.5.4</version>
<name>guacamole-auth-ban</name>
<url>http://guacamole.apache.org/</url>

<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId>
<version>1.5.3</version>
<version>1.5.4</version>
<relativePath>../</relativePath>
</parent>

Expand All @@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.5.3</version>
<version>1.5.4</version>
<scope>provided</scope>

<!-- Exclude transitive dependencies that will be overridden by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{

"guacamoleVersion" : "1.5.3",
"guacamoleVersion" : "1.5.4",

"name" : "Brute-force Authentication Detection/Prevention",
"namespace" : "ban",
Expand Down
6 changes: 3 additions & 3 deletions extensions/guacamole-auth-duo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-duo</artifactId>
<packaging>jar</packaging>
<version>1.5.3</version>
<version>1.5.4</version>
<name>guacamole-auth-duo</name>
<url>http://guacamole.apache.org/</url>

<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId>
<version>1.5.3</version>
<version>1.5.4</version>
<relativePath>../</relativePath>
</parent>

Expand Down Expand Up @@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.5.3</version>
<version>1.5.4</version>
<scope>provided</scope>
</dependency>

Expand Down

0 comments on commit ca241ab

Please sign in to comment.