You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/09/29 20:49:24 UTC
[1/3] guacamole-client git commit: GUACAMOLE-635: Require Java 1.8
for all Java components except guacamole-common.
Repository: guacamole-client
Updated Branches:
refs/heads/staging/1.0.0 d23f88f23 -> e861027f5
GUACAMOLE-635: Require Java 1.8 for all Java components except guacamole-common.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/1fef6a05
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/1fef6a05
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/1fef6a05
Branch: refs/heads/staging/1.0.0
Commit: 1fef6a05e1e9c6a066c88e2e4c8487b08740a75d
Parents: d23f88f
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Sep 29 12:56:17 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Sep 29 12:56:17 2018 -0700
----------------------------------------------------------------------
doc/guacamole-example/pom.xml | 6 +++---
extensions/guacamole-auth-cas/pom.xml | 6 +++---
extensions/guacamole-auth-duo/pom.xml | 6 +++---
extensions/guacamole-auth-header/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-base/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-mysql/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-postgresql/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 6 +++---
extensions/guacamole-auth-ldap/pom.xml | 6 +++---
extensions/guacamole-auth-openid/pom.xml | 6 +++---
extensions/guacamole-auth-quickconnect/pom.xml | 6 +++---
extensions/guacamole-auth-radius/pom.xml | 6 +++---
extensions/guacamole-auth-totp/pom.xml | 6 +++---
guacamole-ext/pom.xml | 6 +++---
guacamole/pom.xml | 6 +++---
15 files changed, 45 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/doc/guacamole-example/pom.xml
----------------------------------------------------------------------
diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index 55b9339..f2f56f3 100644
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Compile using Java 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-cas/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index cfdae86..be07c64 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-duo/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml
index 6f8f5ac..55de752 100644
--- a/extensions/guacamole-auth-duo/pom.xml
+++ b/extensions/guacamole-auth-duo/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-header/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml
index 8a23f9d..9c07bab 100644
--- a/extensions/guacamole-auth-header/pom.xml
+++ b/extensions/guacamole-auth-header/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
index d99534c..3b1cae5 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
@@ -43,14 +43,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
index 8815d8a..b438735 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
@@ -43,14 +43,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
index db2019f..bfe4a3c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
@@ -43,14 +43,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
index d51d3c7..0a8468b 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
@@ -43,14 +43,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index a20a532..6872f6a 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-openid/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml
index b3a16da..63ecd51 100644
--- a/extensions/guacamole-auth-openid/pom.xml
+++ b/extensions/guacamole-auth-openid/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-quickconnect/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml
index a845879..e90bef1 100644
--- a/extensions/guacamole-auth-quickconnect/pom.xml
+++ b/extensions/guacamole-auth-quickconnect/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-radius/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml
index d259158..151875c 100644
--- a/extensions/guacamole-auth-radius/pom.xml
+++ b/extensions/guacamole-auth-radius/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/extensions/guacamole-auth-totp/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml
index 5f1a069..5d8bc45 100644
--- a/extensions/guacamole-auth-totp/pom.xml
+++ b/extensions/guacamole-auth-totp/pom.xml
@@ -37,14 +37,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/guacamole-ext/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index dc561f5..9b76aa1 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -57,14 +57,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1fef6a05/guacamole/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 0899e78..e1a2b47 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -57,14 +57,14 @@
<build>
<plugins>
- <!-- Written for 1.6 -->
+ <!-- Written for Java 1.8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.8</source>
+ <target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Werror</arg>
[3/3] guacamole-client git commit: GUACAMOLE-635: Merge require Java
1.8 for all Java components except guacamoole-common
Posted by vn...@apache.org.
GUACAMOLE-635: Merge require Java 1.8 for all Java components except guacamoole-common
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/e861027f
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/e861027f
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/e861027f
Branch: refs/heads/staging/1.0.0
Commit: e861027f53a58abc6c2abb9809dc4628756d03b7
Parents: d23f88f 182f204
Author: Nick Couchman <vn...@apache.org>
Authored: Sat Sep 29 16:48:17 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Sat Sep 29 16:48:17 2018 -0400
----------------------------------------------------------------------
doc/guacamole-example/pom.xml | 6 +++---
extensions/guacamole-auth-cas/pom.xml | 6 +++---
extensions/guacamole-auth-duo/pom.xml | 6 +++---
extensions/guacamole-auth-header/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-base/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-mysql/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-postgresql/pom.xml | 6 +++---
.../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 6 +++---
extensions/guacamole-auth-ldap/pom.xml | 6 +++---
extensions/guacamole-auth-openid/pom.xml | 6 +++---
extensions/guacamole-auth-quickconnect/pom.xml | 6 +++---
extensions/guacamole-auth-radius/pom.xml | 6 +++---
extensions/guacamole-auth-totp/pom.xml | 6 +++---
guacamole-ext/pom.xml | 6 +++---
.../org/apache/guacamole/net/auth/simple/SimpleDirectory.java | 1 +
guacamole/pom.xml | 6 +++---
16 files changed, 46 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
[2/3] guacamole-client git commit: GUACAMOLE-635: Heap pollution is
not possible within SimpleDirectory(ObjectType... objects).
Posted by vn...@apache.org.
GUACAMOLE-635: Heap pollution is not possible within SimpleDirectory(ObjectType... objects).
>From https://docs.oracle.com/javase/tutorial/java/generics/nonReifiableVarargsType.html#vulnerabilities:
"Heap pollution occurs when a variable of a parameterized type refers
to an object that is not of that parameterized type."
In this case, the parameterized type (ObjectType) and the array of that
type within this constructor are always used as their formal types.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/182f204c
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/182f204c
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/182f204c
Branch: refs/heads/staging/1.0.0
Commit: 182f204c958ab0c188197e403f75e8550bcb8279
Parents: 1fef6a0
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Sep 29 13:19:21 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Sep 29 13:19:21 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/182f204c/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
index 4f64ec8..3865570 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/net/auth/simple/SimpleDirectory.java
@@ -85,6 +85,7 @@ public class SimpleDirectory<ObjectType extends Identifiable>
* @param objects
* The objects that should be present in this directory.
*/
+ @SafeVarargs
public SimpleDirectory(ObjectType... objects) {
this(Arrays.asList(objects));
}