You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/12/02 23:39:25 UTC

[1/5] incubator-guacamole-client git commit: GUACAMOLE-133: Remove unnecessary bundled SLF4J from JDBC auth.

Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 4bab81a94 -> c194e0489


GUACAMOLE-133: Remove unnecessary bundled SLF4J from JDBC auth.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/348bbbf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/348bbbf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/348bbbf5

Branch: refs/heads/master
Commit: 348bbbf53f0f3dbeb62a28dd8da343db5dc8170e
Parents: 119fae2
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Nov 29 21:05:10 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Dec 2 13:46:20 2016 -0800

----------------------------------------------------------------------
 .../modules/guacamole-auth-jdbc-base/pom.xml                  | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/348bbbf5/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 aa2c45f..4241781 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
@@ -105,13 +105,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- SLF4J - logging -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
-        </dependency>
-
         <!-- MyBatis -->
         <dependency>
             <groupId>org.mybatis</groupId>


[2/5] incubator-guacamole-client git commit: GUACAMOLE-133: Exclude StAX dependency, which is part of Java 6.

Posted by jm...@apache.org.
GUACAMOLE-133: Exclude StAX dependency, which is part of Java 6.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/621af69f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/621af69f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/621af69f

Branch: refs/heads/master
Commit: 621af69f87b8bc66f86321b48054177d2996f91b
Parents: 119fae2
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Dec 2 14:24:32 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Fri Dec 2 14:25:41 2016 -0800

----------------------------------------------------------------------
 guacamole/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/621af69f/guacamole/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 544bf7e..2af9a75 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -480,6 +480,15 @@
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
             <version>1.17.1</version>
+
+            <!-- Exclude StAX API, which is part of Java 6 -->
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.stream</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+
         </dependency>
 
     </dependencies>


[4/5] incubator-guacamole-client git commit: GUACAMOLE-133: Merge exclusion of redundant StAX transitive dependency.

Posted by jm...@apache.org.
GUACAMOLE-133: Merge exclusion of redundant StAX transitive dependency.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/8f4a4db4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8f4a4db4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8f4a4db4

Branch: refs/heads/master
Commit: 8f4a4db46fe95a743e078da5885f9ab1dda3d157
Parents: ee69f66 621af69
Author: James Muehlner <ja...@guac-dev.org>
Authored: Fri Dec 2 15:27:23 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Fri Dec 2 15:27:23 2016 -0800

----------------------------------------------------------------------
 guacamole/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------



[3/5] incubator-guacamole-client git commit: GUACAMOLE-133: Merge removal of pointless SLF4J dependency for JDBC auth extension.

Posted by jm...@apache.org.
GUACAMOLE-133: Merge removal of pointless SLF4J dependency for JDBC auth extension.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/ee69f663
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/ee69f663
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/ee69f663

Branch: refs/heads/master
Commit: ee69f663003206dc7266633c1438852b684ac26f
Parents: 119fae2 348bbbf
Author: James Muehlner <ja...@guac-dev.org>
Authored: Fri Dec 2 15:25:23 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Fri Dec 2 15:25:23 2016 -0800

----------------------------------------------------------------------
 .../modules/guacamole-auth-jdbc-base/pom.xml                  | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------



[5/5] incubator-guacamole-client git commit: Merge release-specific changes for 0.9.10-incubating back to master.

Posted by jm...@apache.org.
Merge release-specific changes for 0.9.10-incubating back to master.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/c194e048
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/c194e048
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/c194e048

Branch: refs/heads/master
Commit: c194e04894ff6b4c66d9d9451ca9a93d204f33da
Parents: 4bab81a 8f4a4db
Author: James Muehlner <ja...@guac-dev.org>
Authored: Fri Dec 2 15:37:35 2016 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Fri Dec 2 15:37:35 2016 -0800

----------------------------------------------------------------------
 .../modules/guacamole-auth-jdbc-base/pom.xml                | 7 -------
 guacamole/pom.xml                                           | 9 +++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/c194e048/guacamole/pom.xml
----------------------------------------------------------------------