adam/guacamole-client
1
0 Fork 0
Code Issues Pull Requests 1 Packages Releases Wiki Activity

Merge patch branch changes to main.

Browse Source
This commit is contained in:
Virtually Nick committed 2025-12-26 19:36:30 -05:00
2 parents a6719b1093 2645cffe56
commit 8df2d3d8a6
61 files changed
+538 -222
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+1 -2
View File
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
<relativePath>../../</relativePath>
</parent>
@@ -50,7 +50,6 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency>
<!-- MyBatis -->
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+4 -4
View File
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
<relativePath>../../</relativePath>
</parent>
@@ -42,21 +42,21 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-mysql</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
</dependency>
<!-- PostgreSQL Authentication Extension -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-postgresql</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
</dependency>
<!-- SQL Server Authentication Extension -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
</dependency>
</dependencies>
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+2 -3
View File
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
<relativePath>../../</relativePath>
</parent>
@@ -42,14 +42,13 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency>
<!-- Guacamole JDBC Authentication -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
</dependency>
</dependencies>
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json → extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resource-templates/guac-manifest.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "1.6.0",
"guacamoleVersion" : "${project.version}",
"name" : "MySQL Authentication",
"namespace" : "mysql",
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+2 -3
View File
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
<relativePath>../../</relativePath>
</parent>
@@ -42,14 +42,13 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency>
<!-- Guacamole JDBC Authentication -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
</dependency>
</dependencies>
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json → extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resource-templates/guac-manifest.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "1.6.0",
"guacamoleVersion" : "${project.version}",
"name" : "PostgreSQL Authentication",
"namespace" : "postgresql",
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
+2 -3
View File
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
<relativePath>../../</relativePath>
</parent>
@@ -42,14 +42,13 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency>
<!-- Guacamole JDBC Authentication -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.6.0</version>
<version>${revision}</version>
</dependency>
</dependencies>
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json → extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resource-templates/guac-manifest.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "1.6.0",
"guacamoleVersion" : "${project.version}",
"name" : "SQLServer Authentication",
"namespace" : "sqlserver",
extensions/guacamole-auth-jdbc/pom.xml
+1 -17
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<packaging>pom</packaging>
<version>1.6.0</version>
<name>guacamole-auth-jdbc</name>
<url>http://guacamole.apache.org/</url>
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId>
<version>1.6.0</version>
<relativePath>../</relativePath>
<version>${revision}</version>
</parent>
<modules>
@@ -52,18 +50,4 @@
</modules>
<dependencyManagement>
<dependencies>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.6.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>