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 2017/12/06 14:49:53 UTC

[1/4] guacamole-client git commit: GUACAMOLE-436: Remove Incubator DISCLAIMER files.

Repository: guacamole-client
Updated Branches:
  refs/heads/staging/0.9.14 442fd3daa -> f75786a68


GUACAMOLE-436: Remove Incubator DISCLAIMER files.


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

Branch: refs/heads/staging/0.9.14
Commit: 3df5b222a6aae0ac2f88d7c74c48453c31436002
Parents: 442fd3d
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Dec 5 23:48:08 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Dec 5 23:48:08 2017 -0800

----------------------------------------------------------------------
 DISCLAIMER                                                    | 7 -------
 extensions/guacamole-auth-cas/src/licenses/DISCLAIMER         | 7 -------
 extensions/guacamole-auth-duo/src/licenses/DISCLAIMER         | 7 -------
 extensions/guacamole-auth-header/src/licenses/DISCLAIMER      | 7 -------
 .../modules/guacamole-auth-jdbc-dist/src/licenses/DISCLAIMER  | 7 -------
 extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER        | 7 -------
 extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER      | 7 -------
 extensions/guacamole-auth-openid/src/licenses/DISCLAIMER      | 7 -------
 guacamole/src/licenses/DISCLAIMER                             | 7 -------
 9 files changed, 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/extensions/guacamole-auth-cas/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/licenses/DISCLAIMER b/extensions/guacamole-auth-cas/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/extensions/guacamole-auth-cas/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/extensions/guacamole-auth-duo/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-duo/src/licenses/DISCLAIMER b/extensions/guacamole-auth-duo/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/extensions/guacamole-auth-duo/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/extensions/guacamole-auth-header/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-header/src/licenses/DISCLAIMER b/extensions/guacamole-auth-header/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/extensions/guacamole-auth-header/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/DISCLAIMER b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER b/extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER b/extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/extensions/guacamole-auth-openid/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-openid/src/licenses/DISCLAIMER b/extensions/guacamole-auth-openid/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/extensions/guacamole-auth-openid/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3df5b222/guacamole/src/licenses/DISCLAIMER
----------------------------------------------------------------------
diff --git a/guacamole/src/licenses/DISCLAIMER b/guacamole/src/licenses/DISCLAIMER
deleted file mode 100644
index 1a9c3be..0000000
--- a/guacamole/src/licenses/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Guacamole is an effort undergoing incubation at The Apache Software
-Foundation (ASF). Incubation is required of all newly accepted projects until a
-further review indicates that the infrastructure, communications, and decision
-making process have stabilized in a manner consistent with other successful ASF
-projects. While incubation status is not necessarily a reflection of the
-completeness or stability of the code, it does indicate that the project has
-yet to be fully endorsed by the ASF.


[3/4] guacamole-client git commit: GUACAMOLE-436: Remove old references to pre-Incubator project.

Posted by vn...@apache.org.
GUACAMOLE-436: Remove old references to pre-Incubator project.


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

Branch: refs/heads/staging/0.9.14
Commit: 8d92e45227be96ed3c109d93b40b7b5aa08aa309
Parents: 7c4223c
Author: Michael Jumper <mj...@apache.org>
Authored: Wed Dec 6 00:08:11 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Dec 6 00:08:11 2017 -0800

----------------------------------------------------------------------
 guacamole-common-js/pom.xml | 14 --------------
 guacamole-common/pom.xml    | 14 --------------
 guacamole-ext/pom.xml       | 14 --------------
 guacamole/pom.xml           | 14 --------------
 4 files changed, 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/8d92e452/guacamole-common-js/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index 16dcb3f..c7ea73d 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -52,20 +52,6 @@
 
     </scm>
 
-    <!-- Developers -->
-    <developers>
-        <developer>
-            <id>mike.jumper</id>
-            <name>Michael Jumper</name>
-            <email>mike.jumper@guac-dev.org</email>
-        </developer>
-        <developer>
-            <id>james.muehlner</id>
-            <name>James Muehlner</name>
-            <email>james.muehlner@guac-dev.org</email>
-        </developer>
-    </developers>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/8d92e452/guacamole-common/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index 1dd7bcf..00fdb45 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/pom.xml
@@ -50,20 +50,6 @@
         <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
-    <!-- Developers -->
-    <developers>
-        <developer>
-            <id>mike.jumper</id>
-            <name>Michael Jumper</name>
-            <email>mike.jumper@guac-dev.org</email>
-        </developer>
-        <developer>
-            <id>james.muehlner</id>
-            <name>James Muehlner</name>
-            <email>james.muehlner@guac-dev.org</email>
-        </developer>
-    </developers>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/8d92e452/guacamole-ext/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index 62f543c..44154a2 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -50,20 +50,6 @@
         <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
-    <!-- Developers -->
-    <developers>
-        <developer>
-            <id>mike.jumper</id>
-            <name>Michael Jumper</name>
-            <email>mike.jumper@guac-dev.org</email>
-        </developer>
-        <developer>
-            <id>james.muehlner</id>
-            <name>James Muehlner</name>
-            <email>james.muehlner@guac-dev.org</email>
-        </developer>
-    </developers>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/8d92e452/guacamole/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index a4ca0c0..712be72 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -50,20 +50,6 @@
         <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
-    <!-- Developers -->
-    <developers>
-        <developer>
-            <id>mike.jumper</id>
-            <name>Michael Jumper</name>
-            <email>mike.jumper@guac-dev.org</email>
-        </developer>
-        <developer>
-            <id>james.muehlner</id>
-            <name>James Muehlner</name>
-            <email>james.muehlner@guac-dev.org</email>
-        </developer>
-    </developers>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>


[4/4] guacamole-client git commit: GUACAMOLE-436: Merge remove incubator prefixes and DISCLAIMER.

Posted by vn...@apache.org.
GUACAMOLE-436: Merge remove incubator prefixes and DISCLAIMER.


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

Branch: refs/heads/staging/0.9.14
Commit: f75786a688d959c4bf3810766f829ccf62e82760
Parents: 442fd3d 8d92e45
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Dec 6 09:48:57 2017 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed Dec 6 09:48:57 2017 -0500

----------------------------------------------------------------------
 CONTRIBUTING                                    |  8 ++++----
 DISCLAIMER                                      |  7 -------
 README                                          |  4 ++--
 doc/guacamole-example/pom.xml                   |  2 +-
 doc/guacamole-playback-example/pom.xml          |  2 +-
 extensions/guacamole-auth-cas/pom.xml           |  2 +-
 .../guacamole-auth-cas/src/licenses/DISCLAIMER  |  7 -------
 extensions/guacamole-auth-duo/pom.xml           |  2 +-
 .../guacamole-auth-duo/src/licenses/DISCLAIMER  |  7 -------
 extensions/guacamole-auth-header/pom.xml        |  2 +-
 .../src/licenses/DISCLAIMER                     |  7 -------
 .../modules/guacamole-auth-jdbc-base/pom.xml    |  2 +-
 .../modules/guacamole-auth-jdbc-dist/pom.xml    |  2 +-
 .../src/licenses/DISCLAIMER                     |  7 -------
 .../modules/guacamole-auth-jdbc-mysql/pom.xml   |  2 +-
 .../guacamole-auth-jdbc-postgresql/pom.xml      |  2 +-
 .../guacamole-auth-jdbc-sqlserver/pom.xml       |  2 +-
 extensions/guacamole-auth-jdbc/pom.xml          |  2 +-
 extensions/guacamole-auth-ldap/pom.xml          |  2 +-
 .../guacamole-auth-ldap/src/licenses/DISCLAIMER |  7 -------
 extensions/guacamole-auth-noauth/pom.xml        |  2 +-
 .../src/licenses/DISCLAIMER                     |  7 -------
 extensions/guacamole-auth-openid/pom.xml        |  2 +-
 .../src/licenses/DISCLAIMER                     |  7 -------
 guacamole-common-js/pom.xml                     | 20 +++-----------------
 guacamole-common/pom.xml                        | 20 +++-----------------
 guacamole-docker/README.md                      | 18 +++++++++---------
 guacamole-docker/bin/build-guacamole.sh         | 10 +++++-----
 guacamole-ext/pom.xml                           | 20 +++-----------------
 guacamole/pom.xml                               | 20 +++-----------------
 guacamole/src/licenses/DISCLAIMER               |  7 -------
 pom.xml                                         |  2 +-
 32 files changed, 47 insertions(+), 166 deletions(-)
----------------------------------------------------------------------



[2/4] guacamole-client git commit: GUACAMOLE-436: Remove incubator prefix from repositories and URLs.

Posted by vn...@apache.org.
GUACAMOLE-436: Remove incubator prefix from repositories and URLs.


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

Branch: refs/heads/staging/0.9.14
Commit: 7c4223ce3e64b320955c9489f2cd71a24f3d4280
Parents: 3df5b22
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Dec 5 23:56:46 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Dec 6 00:02:33 2017 -0800

----------------------------------------------------------------------
 CONTRIBUTING                                      |  8 ++++----
 README                                            |  4 ++--
 doc/guacamole-example/pom.xml                     |  2 +-
 doc/guacamole-playback-example/pom.xml            |  2 +-
 extensions/guacamole-auth-cas/pom.xml             |  2 +-
 extensions/guacamole-auth-duo/pom.xml             |  2 +-
 extensions/guacamole-auth-header/pom.xml          |  2 +-
 .../modules/guacamole-auth-jdbc-base/pom.xml      |  2 +-
 .../modules/guacamole-auth-jdbc-dist/pom.xml      |  2 +-
 .../modules/guacamole-auth-jdbc-mysql/pom.xml     |  2 +-
 .../guacamole-auth-jdbc-postgresql/pom.xml        |  2 +-
 .../modules/guacamole-auth-jdbc-sqlserver/pom.xml |  2 +-
 extensions/guacamole-auth-jdbc/pom.xml            |  2 +-
 extensions/guacamole-auth-ldap/pom.xml            |  2 +-
 extensions/guacamole-auth-noauth/pom.xml          |  2 +-
 extensions/guacamole-auth-openid/pom.xml          |  2 +-
 guacamole-common-js/pom.xml                       |  6 +++---
 guacamole-common/pom.xml                          |  6 +++---
 guacamole-docker/README.md                        | 18 +++++++++---------
 guacamole-docker/bin/build-guacamole.sh           | 10 +++++-----
 guacamole-ext/pom.xml                             |  6 +++---
 guacamole/pom.xml                                 |  6 +++---
 pom.xml                                           |  2 +-
 23 files changed, 47 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/CONTRIBUTING
----------------------------------------------------------------------
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 3864b66..9f005cd 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -24,10 +24,10 @@ the review process.
 
     The Guacamole source is maintained in git repositories hosted on GitHub:
 
-        https://github.com/apache/incubator-guacamole-client
-        https://github.com/apache/incubator-guacamole-manual
-        https://github.com/apache/incubator-guacamole-server
-        https://github.com/apache/incubator-guacamole-website
+        https://github.com/apache/guacamole-client
+        https://github.com/apache/guacamole-manual
+        https://github.com/apache/guacamole-server
+        https://github.com/apache/guacamole-website
 
     To make your changes, fork the applicable repositories and make commits
     to a topic branch in your fork. Commits should be made in logical units

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/README
----------------------------------------------------------------------
diff --git a/README b/README
index 30e913b..a3a5752 100644
--- a/README
+++ b/README
@@ -9,11 +9,11 @@ technical users intending to compile parts of Apache Guacamole themselves.
 Source archives and pre-built .war files are available from the downloads
 section of the project website:
  
-    http://guacamole.incubator.apache.org/
+    http://guacamole.apache.org/
 
 A full manual is available as well:
 
-    http://guacamole.incubator.apache.org/doc/gug/
+    http://guacamole.apache.org/doc/gug/
 
 
 ------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/doc/guacamole-example/pom.xml
----------------------------------------------------------------------
diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index 74a73ed..3a0438e 100644
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -28,7 +28,7 @@
     <packaging>war</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-example</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/doc/guacamole-playback-example/pom.xml
----------------------------------------------------------------------
diff --git a/doc/guacamole-playback-example/pom.xml b/doc/guacamole-playback-example/pom.xml
index 1dd8aff..d567f7b 100644
--- a/doc/guacamole-playback-example/pom.xml
+++ b/doc/guacamole-playback-example/pom.xml
@@ -28,7 +28,7 @@
     <packaging>war</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-playback-example</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-cas/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index e76c50b..352dcb8 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-cas</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-duo/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml
index 104b594..2d49cea 100644
--- a/extensions/guacamole-auth-duo/pom.xml
+++ b/extensions/guacamole-auth-duo/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-duo</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-header/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml
index c30aa9b..409a9a6 100644
--- a/extensions/guacamole-auth-header/pom.xml
+++ b/extensions/guacamole-auth-header/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-header</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/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 4de1d69..0bd3821 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
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-base</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-base</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
index 05f5572..46c1259 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-dist</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-dist</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/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 232001f..f332c24 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
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-mysql</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-mysql</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/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 7fd2eaa..cac68f2 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
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-postgresql</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/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 82776f7..c1e7ec7 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
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-sqlserver</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index 7869c86..f9278d1 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-jdbc</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 7eef08b..782fd26 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-ldap</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-noauth/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 65a43be..5060f53 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-noauth</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/extensions/guacamole-auth-openid/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml
index 4076998..251fbf0 100644
--- a/extensions/guacamole-auth-openid/pom.xml
+++ b/extensions/guacamole-auth-openid/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-openid</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/guacamole-common-js/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index 10c8c44..16dcb3f 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-common-js</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The base JavaScript API of the Guacamole project, providing JavaScript
@@ -47,8 +47,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
 
     </scm>
 

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/guacamole-common/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index b410858..1dd7bcf 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-common</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The base Java API of the Guacamole project, providing Java support for
@@ -46,8 +46,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
     <!-- Developers -->

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/guacamole-docker/README.md
----------------------------------------------------------------------
diff --git a/guacamole-docker/README.md b/guacamole-docker/README.md
index 04066a0..21b9454 100644
--- a/guacamole-docker/README.md
+++ b/guacamole-docker/README.md
@@ -1,9 +1,9 @@
 What is Apache Guacamole?
 =========================
 
-[Apache Guacamole](http://guacamole.incubator.apache.org/) is a clientless
-remote desktop gateway. It supports standard protocols like VNC and RDP. We
-call it clientless because no plugins or client software are required.
+[Apache Guacamole](http://guacamole.apache.org/) is a clientless remote desktop
+gateway. It supports standard protocols like VNC and RDP. We call it clientless
+because no plugins or client software are required.
 
 Thanks to HTML5, once Guacamole is installed on a server, all you need to
 access your desktops is a web browser.
@@ -54,12 +54,12 @@ necessary SQL to do this is included in the Guacamole image.
 
 To generate a SQL script which can be used to initialize a fresh PostgreSQL
 database
-[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql):
+[as documented in the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql):
 
     docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --postgres > initdb.sql
 
 Alternatively, you can use the SQL scripts included with
-[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
+[guacamole-auth-jdbc](https://github.com/apache/guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
 
 Once this script is generated, you must:
 
@@ -70,7 +70,7 @@ Once this script is generated, you must:
 
 The process for doing this via the `psql` and `createdb` utilities included
 with PostgreSQL is documented in
-[the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql).
+[the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql).
 
 Deploying Guacamole with MySQL authentication
 --------------------------------------------------
@@ -97,12 +97,12 @@ need to do so prior to using Guacamole. A convenience script for generating the
 necessary SQL to do this is included in the Guacamole image.
 
 To generate a SQL script which can be used to initialize a fresh MySQL database
-[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql):
+[as documented in the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql):
 
     docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql
 
 Alternatively, you can use the SQL scripts included with
-[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema).
+[guacamole-auth-jdbc](https://github.com/apache/guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema).
 
 Once this script is generated, you must:
 
@@ -113,7 +113,7 @@ Once this script is generated, you must:
 
 The process for doing this via the `mysql` utility included with MySQL is
 documented in
-[the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql).
+[the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql).
 
 Reporting issues
 ================

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/guacamole-docker/bin/build-guacamole.sh
----------------------------------------------------------------------
diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh
index 41e01b5..8a35119 100755
--- a/guacamole-docker/bin/build-guacamole.sh
+++ b/guacamole-docker/bin/build-guacamole.sh
@@ -22,11 +22,11 @@
 ## @fn build-guacamole.sh
 ##
 ## Builds Guacamole, saving "guacamole.war" and all applicable extension .jars
-## using the incubator-guacamole-client source contained within the given
-## directory. Extension files will be grouped by their associated type, with
-## all MySQL files being placed within the "mysql/" subdirectory of the
-## destination, all PostgreSQL files being placed within the "postgresql/"
-## subdirectory of the destination, etc.
+## using the guacamole-client source contained within the given directory.
+## Extension files will be grouped by their associated type, with all MySQL
+## files being placed within the "mysql/" subdirectory of the destination, all
+## PostgreSQL files being placed within the "postgresql/" subdirectory of the
+## destination, etc.
 ##
 ## @param BUILD_DIR
 ##     The directory which currently contains the guacamole-client source and

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/guacamole-ext/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index e1c0fa9..62f543c 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-ext</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The Java API for extending the main Guacamole web application. This
@@ -46,8 +46,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
     <!-- Developers -->

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/guacamole/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 4784cda..a4ca0c0 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -28,7 +28,7 @@
     <packaging>war</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The Guacamole web application, providing authentication and an HTML5
@@ -46,8 +46,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
     <!-- Developers -->

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/7c4223ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 55228f5..954a318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-client</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>