safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.9.11-incubating changes back to master.

Browse Source
This commit is contained in:
James Muehlner
2017-01-10 13:24:38 -08:00
parent d45580f226 ebdf02db75
commit 5a84ed6d20
17 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/guacamole-auth-duo/pom.xml
View File

@@ -26,7 +26,7 @@
<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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<name>guacamole-auth-duo</name> <name>guacamole-auth-duo</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>
@@ -221,7 +221,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "0.9.10-incubating", "guacamoleVersion" : "0.9.11-incubating",
"name" : "Duo TFA Authentication Backend", "name" : "Duo TFA Authentication Backend",
"namespace" : "duo", "namespace" : "duo",

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
View File

@@ -36,7 +36,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>

6
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
View File

@@ -36,7 +36,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -99,14 +99,14 @@
<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>0.9.10-incubating</version> <version>0.9.11-incubating</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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
View File

@@ -36,7 +36,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -120,7 +120,7 @@
<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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "0.9.10-incubating", "guacamoleVersion" : "0.9.11-incubating",
"name" : "MySQL Authentication", "name" : "MySQL Authentication",
"namespace" : "guac-mysql", "namespace" : "guac-mysql",

4
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
View File

@@ -36,7 +36,7 @@
<parent> <parent>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId> <artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<relativePath>../../</relativePath> <relativePath>../../</relativePath>
</parent> </parent>
@@ -120,7 +120,7 @@
<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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "0.9.10-incubating", "guacamoleVersion" : "0.9.11-incubating",
"name" : "PostgreSQL Authentication", "name" : "PostgreSQL Authentication",
"namespace" : "guac-postgresql", "namespace" : "guac-postgresql",

4
extensions/guacamole-auth-jdbc/pom.xml
View File

@@ -26,7 +26,7 @@
<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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<name>guacamole-auth-jdbc</name> <name>guacamole-auth-jdbc</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>
@@ -80,7 +80,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
extensions/guacamole-auth-ldap/pom.xml
View File

@@ -26,7 +26,7 @@
<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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<name>guacamole-auth-ldap</name> <name>guacamole-auth-ldap</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>
@@ -138,7 +138,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "0.9.10-incubating", "guacamoleVersion" : "0.9.11-incubating",
"name" : "LDAP Authentication", "name" : "LDAP Authentication",
"namespace" : "guac-ldap", "namespace" : "guac-ldap",

4
extensions/guacamole-auth-noauth/pom.xml
View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-noauth</artifactId> <artifactId>guacamole-auth-noauth</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<name>guacamole-auth-noauth</name> <name>guacamole-auth-noauth</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>
@@ -138,7 +138,7 @@
<dependency> <dependency>
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId> <artifactId>guacamole-ext</artifactId>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
View File

@@ -1,6 +1,6 @@
{ {
"guacamoleVersion" : "0.9.10-incubating", "guacamoleVersion" : "0.9.11-incubating",
"name" : "Disabled Authentication", "name" : "Disabled Authentication",
"namespace" : "guac-noauth", "namespace" : "guac-noauth",

2
guacamole-ext/pom.xml
View File

@@ -26,7 +26,7 @@
<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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<name>guacamole-ext</name> <name>guacamole-ext</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>

2
guacamole/pom.xml
View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId> <groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId> <artifactId>guacamole</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<name>guacamole</name> <name>guacamole</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>

2
guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
View File

@@ -61,7 +61,7 @@ public class ExtensionModule extends ServletModule {
private static final List<String> ALLOWED_GUACAMOLE_VERSIONS = private static final List<String> ALLOWED_GUACAMOLE_VERSIONS =
Collections.unmodifiableList(Arrays.asList( Collections.unmodifiableList(Arrays.asList(
"*", "*",
"0.9.10-incubating" "0.9.11-incubating"
)); ));
/** /**

2
pom.xml
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>0.9.10-incubating</version> <version>0.9.11-incubating</version>
<name>guacamole-client</name> <name>guacamole-client</name>
<url>http://guacamole.incubator.apache.org/</url> <url>http://guacamole.incubator.apache.org/</url>