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

GUACAMOLE-2139: Inherit guacamole-client version via "revision" property (supported since Maven 3.5.0).

Browse Source
This commit is contained in:
Michael Jumper committed 2025-12-25 14:54:31 -08:00
1 parent 563bd9cb14
commit 87371e608c
34 files changed
+70 -156
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

extensions/guacamole-auth-ban/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-ban</artifactId> <artifactId>guacamole-auth-ban</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-ban</name> <name>guacamole-auth-ban</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@@ -51,8 +49,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
<!-- Exclude transitive dependencies that will be overridden by <!-- Exclude transitive dependencies that will be overridden by
newer versions required by Caffeine --> newer versions required by Caffeine -->
extensions/guacamole-auth-duo/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-duo</artifactId> <artifactId>guacamole-auth-duo</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-duo</name> <name>guacamole-auth-duo</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<properties> <properties>
@@ -49,8 +47,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guava - Utility Library --> <!-- Guava - Utility Library -->
extensions/guacamole-auth-header/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-header</artifactId> <artifactId>guacamole-auth-header</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-header</name> <name>guacamole-auth-header</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@@ -43,8 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guice --> <!-- Guice -->
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+1 -2
View File
@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -50,7 +50,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- MyBatis --> <!-- MyBatis -->
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+4 -4
View File
@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -42,21 +42,21 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-mysql</artifactId> <artifactId>guacamole-auth-jdbc-mysql</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<!-- PostgreSQL Authentication Extension --> <!-- PostgreSQL Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-postgresql</artifactId> <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<!-- SQL Server Authentication Extension --> <!-- SQL Server Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-sqlserver</artifactId> <artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+2 -3
View File
@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -42,14 +42,13 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guacamole JDBC Authentication --> <!-- Guacamole JDBC Authentication -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId> <artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+2 -3
View File
@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -42,14 +42,13 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guacamole JDBC Authentication --> <!-- Guacamole JDBC Authentication -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId> <artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
+2 -3
View File
@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -42,14 +42,13 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guacamole JDBC Authentication --> <!-- Guacamole JDBC Authentication -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId> <artifactId>guacamole-auth-jdbc-base</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>
extensions/guacamole-auth-jdbc/pom.xml
+1 -17
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.1</version>
<name>guacamole-auth-jdbc</name> <name>guacamole-auth-jdbc</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<modules> <modules>
@@ -52,18 +50,4 @@
</modules> </modules>
<dependencyManagement>
<dependencies>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>
extensions/guacamole-auth-json/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-json</artifactId> <artifactId>guacamole-auth-json</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-json</name> <name>guacamole-auth-json</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@@ -43,8 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guice --> <!-- Guice -->
extensions/guacamole-auth-ldap/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-ldap</artifactId> <artifactId>guacamole-auth-ldap</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-ldap</name> <name>guacamole-auth-ldap</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@@ -43,8 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Apache Directory LDAP API --> <!-- Apache Directory LDAP API -->
extensions/guacamole-auth-quickconnect/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-quickconnect</artifactId> <artifactId>guacamole-auth-quickconnect</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-quickconnect</name> <name>guacamole-auth-quickconnect</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<build> <build>
@@ -98,8 +96,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guice --> <!-- Guice -->
extensions/guacamole-auth-radius/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-radius</artifactId> <artifactId>guacamole-auth-radius</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-radius</name> <name>guacamole-auth-radius</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<build> <build>
@@ -115,8 +113,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guava - Utility Library --> <!-- Guava - Utility Library -->
extensions/guacamole-auth-restrict/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-restrict</artifactId> <artifactId>guacamole-auth-restrict</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-restrict</name> <name>guacamole-auth-restrict</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<build> <build>
@@ -127,8 +125,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guava - Utility Library --> <!-- Guava - Utility Library -->
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml
+1 -1
View File
@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
+1 -2
View File
@@ -26,14 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-cas</artifactId> <artifactId>guacamole-auth-sso-cas</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-sso-cas</name> <name>guacamole-auth-sso-cas</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml
+5 -5
View File
@@ -32,7 +32,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -42,28 +42,28 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-cas</artifactId> <artifactId>guacamole-auth-sso-cas</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<!-- OpenID Authentication Extension --> <!-- OpenID Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-openid</artifactId> <artifactId>guacamole-auth-sso-openid</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<!-- SAML Authentication Extension --> <!-- SAML Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-saml</artifactId> <artifactId>guacamole-auth-sso-saml</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<!-- SSL Authentication Extension --> <!-- SSL Authentication Extension -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-ssl</artifactId> <artifactId>guacamole-auth-sso-ssl</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml
+1 -2
View File
@@ -26,14 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-openid</artifactId> <artifactId>guacamole-auth-sso-openid</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-sso-openid</name> <name>guacamole-auth-sso-openid</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
+1 -2
View File
@@ -26,14 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-saml</artifactId> <artifactId>guacamole-auth-sso-saml</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-sso-saml</name> <name>guacamole-auth-sso-saml</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml
+1 -2
View File
@@ -26,14 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-ssl</artifactId> <artifactId>guacamole-auth-sso-ssl</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-sso-ssl</name> <name>guacamole-auth-sso-ssl</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
extensions/guacamole-auth-sso/pom.xml
+2 -12
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso</artifactId> <artifactId>guacamole-auth-sso</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.1</version>
<name>guacamole-auth-sso</name> <name>guacamole-auth-sso</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<modules> <modules>
@@ -56,19 +54,11 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency>
<!-- Core SSO support --> <!-- Core SSO support -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-sso-base</artifactId> <artifactId>guacamole-auth-sso-base</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<!-- Java servlet API --> <!-- Java servlet API -->
extensions/guacamole-auth-totp/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-totp</artifactId> <artifactId>guacamole-auth-totp</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-auth-totp</name> <name>guacamole-auth-totp</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<build> <build>
@@ -127,8 +125,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guava - Utility Library --> <!-- Guava - Utility Library -->
extensions/guacamole-display-statistics/pom.xml
+1 -3
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-display-statistics</artifactId> <artifactId>guacamole-display-statistics</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-display-statistics</name> <name>guacamole-display-statistics</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<build> <build>
extensions/guacamole-history-recording-storage/pom.xml
+1 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-history-recording-storage</artifactId> <artifactId>guacamole-history-recording-storage</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-history-recording-storage</name> <name>guacamole-history-recording-storage</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<dependencies> <dependencies>
@@ -43,8 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml
+1 -2
View File
@@ -36,7 +36,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault</artifactId> <artifactId>guacamole-vault</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -46,7 +46,6 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Jackson for YAML support --> <!-- Jackson for YAML support -->
extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml
+2 -2
View File
@@ -36,7 +36,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault</artifactId> <artifactId>guacamole-vault</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -46,7 +46,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault-ksm</artifactId> <artifactId>guacamole-vault-ksm</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
</dependencies> </dependencies>
extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
+2 -4
View File
@@ -26,14 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault-ksm</artifactId> <artifactId>guacamole-vault-ksm</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-vault-ksm</name> <name>guacamole-vault-ksm</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault</artifactId> <artifactId>guacamole-vault</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -47,14 +46,13 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<!-- Guacamole base key vault support --> <!-- Guacamole base key vault support -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault-base</artifactId> <artifactId>guacamole-vault-base</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
extensions/guacamole-vault/pom.xml
+1 -17
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-vault</artifactId> <artifactId>guacamole-vault</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.1</version>
<name>guacamole-vault</name> <name>guacamole-vault</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<modules> <modules>
@@ -50,18 +48,4 @@
</modules> </modules>
<dependencyManagement>
<dependencies>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>1.6.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project> </project>
extensions/pom.xml
+15 -3
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>extensions</artifactId> <artifactId>extensions</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.1</version>
<name>extensions</name> <name>extensions</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<modules> <modules>
@@ -134,6 +132,20 @@
</dependencies> </dependencies>
<dependencyManagement>
<dependencies>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
<profiles> <profiles>
<!-- Build extensions with LGPL-licensed dependencies only if explicitly requested --> <!-- Build extensions with LGPL-licensed dependencies only if explicitly requested -->
guacamole-common-js/pom.xml
+1 -3
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.1</version>
<name>guacamole-common-js</name> <name>guacamole-common-js</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<properties> <properties>
guacamole-common/pom.xml
+1 -3
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-common</name> <name>guacamole-common</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<description> <description>
guacamole-ext/pom.xml
+2 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.6.1</version>
<name>guacamole-ext</name> <name>guacamole-ext</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<description> <description>
@@ -87,8 +85,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId> <artifactId>guacamole-common</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<scope>compile</scope>
</dependency> </dependency>
<!-- JUnit --> <!-- JUnit -->
guacamole/pom.xml
+3 -5
View File
@@ -26,15 +26,13 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId> <artifactId>guacamole</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.6.1</version>
<name>guacamole</name> <name>guacamole</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<relativePath>../</relativePath>
</parent> </parent>
<description> <description>
@@ -254,14 +252,14 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>1.6.1</version> <version>${revision}</version>
</dependency> </dependency>
<!-- Guacamole JavaScript API --> <!-- Guacamole JavaScript API -->
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId> <artifactId>guacamole-common-js</artifactId>
<version>1.6.1</version> <version>${revision}</version>
<type>zip</type> <type>zip</type>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
pom.xml
+7 -1
View File
@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId> <artifactId>guacamole-client</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.1</version> <version>${revision}</version>
<name>guacamole-client</name> <name>guacamole-client</name>
<url>http://guacamole.apache.org/</url> <url>http://guacamole.apache.org/</url>
@@ -35,6 +35,12 @@
<!-- Core properties --> <!-- Core properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- The Guacamole version for the entirety of guacamole-client (this is
referenced by this and all other pom.xml files within guacamole-client,
and is a special case within Maven as one of the few properties allowed
within the pom.xml version and intended for this purpose) -->
<revision>1.6.1</revision>
<!-- Dependency versions --> <!-- Dependency versions -->
<guava.version>32.1.3-jre</guava.version> <guava.version>32.1.3-jre</guava.version>
<guice.version>5.1.0</guice.version> <guice.version>5.1.0</guice.version>