From 3df5b222a6aae0ac2f88d7c74c48453c31436002 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 5 Dec 2017 23:48:08 -0800 Subject: [PATCH 1/3] GUACAMOLE-436: Remove Incubator DISCLAIMER files. --- 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 ------- .../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(-) delete mode 100644 DISCLAIMER delete mode 100644 extensions/guacamole-auth-cas/src/licenses/DISCLAIMER delete mode 100644 extensions/guacamole-auth-duo/src/licenses/DISCLAIMER delete mode 100644 extensions/guacamole-auth-header/src/licenses/DISCLAIMER delete mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/DISCLAIMER delete mode 100644 extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER delete mode 100644 extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER delete mode 100644 extensions/guacamole-auth-openid/src/licenses/DISCLAIMER delete mode 100644 guacamole/src/licenses/DISCLAIMER diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. diff --git a/extensions/guacamole-auth-cas/src/licenses/DISCLAIMER b/extensions/guacamole-auth-cas/src/licenses/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. diff --git a/extensions/guacamole-auth-duo/src/licenses/DISCLAIMER b/extensions/guacamole-auth-duo/src/licenses/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. diff --git a/extensions/guacamole-auth-header/src/licenses/DISCLAIMER b/extensions/guacamole-auth-header/src/licenses/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. 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 1a9c3be8d..000000000 --- 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. diff --git a/extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER b/extensions/guacamole-auth-ldap/src/licenses/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. diff --git a/extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER b/extensions/guacamole-auth-noauth/src/licenses/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. diff --git a/extensions/guacamole-auth-openid/src/licenses/DISCLAIMER b/extensions/guacamole-auth-openid/src/licenses/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. diff --git a/guacamole/src/licenses/DISCLAIMER b/guacamole/src/licenses/DISCLAIMER deleted file mode 100644 index 1a9c3be8d..000000000 --- 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. From 7c4223ce3e64b320955c9489f2cd71a24f3d4280 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 5 Dec 2017 23:56:46 -0800 Subject: [PATCH 2/3] GUACAMOLE-436: Remove incubator prefix from repositories and URLs. --- 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 +- .../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(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index 3864b66e8..9f005cdaa 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 diff --git a/README b/README index 30e913be1..a3a575222 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/ ------------------------------------------------------------ diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index 74a73ed64..3a0438e11 100644 --- a/doc/guacamole-example/pom.xml +++ b/doc/guacamole-example/pom.xml @@ -28,7 +28,7 @@ war 0.9.13-incubating guacamole-example - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/doc/guacamole-playback-example/pom.xml b/doc/guacamole-playback-example/pom.xml index 1dd8aff84..d567f7bf6 100644 --- a/doc/guacamole-playback-example/pom.xml +++ b/doc/guacamole-playback-example/pom.xml @@ -28,7 +28,7 @@ war 0.9.13-incubating guacamole-playback-example - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml index e76c50b88..352dcb84e 100644 --- a/extensions/guacamole-auth-cas/pom.xml +++ b/extensions/guacamole-auth-cas/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-auth-cas - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml index 104b5942b..2d49cea97 100644 --- a/extensions/guacamole-auth-duo/pom.xml +++ b/extensions/guacamole-auth-duo/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-auth-duo - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml index c30aa9bbc..409a9a6d4 100644 --- a/extensions/guacamole-auth-header/pom.xml +++ b/extensions/guacamole-auth-header/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-auth-header - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 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 4de1d69aa..0bd38218f 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 @@ guacamole-auth-jdbc-base jar guacamole-auth-jdbc-base - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 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 05f5572d4..46c12598f 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 @@ guacamole-auth-jdbc-dist jar guacamole-auth-jdbc-dist - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 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 232001f11..f332c2423 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 @@ guacamole-auth-jdbc-mysql jar guacamole-auth-jdbc-mysql - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 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 7fd2eaa16..cac68f208 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 @@ guacamole-auth-jdbc-postgresql jar guacamole-auth-jdbc-postgresql - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 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 82776f7d0..c1e7ec78c 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 @@ guacamole-auth-jdbc-sqlserver jar guacamole-auth-jdbc-sqlserver - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml index 7869c8650..f9278d1da 100644 --- a/extensions/guacamole-auth-jdbc/pom.xml +++ b/extensions/guacamole-auth-jdbc/pom.xml @@ -28,7 +28,7 @@ pom 0.9.13-incubating guacamole-auth-jdbc - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 7eef08ba9..782fd2690 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-auth-ldap - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml index 65a43be46..5060f5323 100644 --- a/extensions/guacamole-auth-noauth/pom.xml +++ b/extensions/guacamole-auth-noauth/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-auth-noauth - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml index 4076998f1..251fbf011 100644 --- a/extensions/guacamole-auth-openid/pom.xml +++ b/extensions/guacamole-auth-openid/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-auth-openid - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml index 10c8c4467..16dcb3f46 100644 --- a/guacamole-common-js/pom.xml +++ b/guacamole-common-js/pom.xml @@ -28,7 +28,7 @@ pom 0.9.13-incubating guacamole-common-js - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ The base JavaScript API of the Guacamole project, providing JavaScript @@ -47,8 +47,8 @@ - https://github.com/apache/incubator-guacamole-client - scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git + https://github.com/apache/guacamole-client + scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index b41085885..1dd7bcf12 100644 --- a/guacamole-common/pom.xml +++ b/guacamole-common/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-common - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ The base Java API of the Guacamole project, providing Java support for @@ -46,8 +46,8 @@ - https://github.com/apache/incubator-guacamole-client - scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git + https://github.com/apache/guacamole-client + scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git diff --git a/guacamole-docker/README.md b/guacamole-docker/README.md index 04066a049..21b945428 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 ================ diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh index 41e01b500..8a351191c 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 diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index e1c0fa98e..62f543c07 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -28,7 +28,7 @@ jar 0.9.13-incubating guacamole-ext - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ The Java API for extending the main Guacamole web application. This @@ -46,8 +46,8 @@ - https://github.com/apache/incubator-guacamole-client - scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git + https://github.com/apache/guacamole-client + scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git diff --git a/guacamole/pom.xml b/guacamole/pom.xml index 4784cdabd..a4ca0c0ae 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -28,7 +28,7 @@ war 0.9.13-incubating guacamole - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ The Guacamole web application, providing authentication and an HTML5 @@ -46,8 +46,8 @@ - https://github.com/apache/incubator-guacamole-client - scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git + https://github.com/apache/guacamole-client + scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git diff --git a/pom.xml b/pom.xml index 55228f5aa..954a3180b 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ pom 0.9.13-incubating guacamole-client - http://guacamole.incubator.apache.org/ + http://guacamole.apache.org/ UTF-8 From 8d92e45227be96ed3c109d93b40b7b5aa08aa309 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 6 Dec 2017 00:08:11 -0800 Subject: [PATCH 3/3] GUACAMOLE-436: Remove old references to pre-Incubator project. --- 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(-) diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml index 16dcb3f46..c7ea73d7d 100644 --- a/guacamole-common-js/pom.xml +++ b/guacamole-common-js/pom.xml @@ -52,20 +52,6 @@ - - - - mike.jumper - Michael Jumper - mike.jumper@guac-dev.org - - - james.muehlner - James Muehlner - james.muehlner@guac-dev.org - - - UTF-8 diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index 1dd7bcf12..00fdb45f6 100644 --- a/guacamole-common/pom.xml +++ b/guacamole-common/pom.xml @@ -50,20 +50,6 @@ scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git - - - - mike.jumper - Michael Jumper - mike.jumper@guac-dev.org - - - james.muehlner - James Muehlner - james.muehlner@guac-dev.org - - - UTF-8 diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index 62f543c07..44154a276 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -50,20 +50,6 @@ scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git - - - - mike.jumper - Michael Jumper - mike.jumper@guac-dev.org - - - james.muehlner - James Muehlner - james.muehlner@guac-dev.org - - - UTF-8 diff --git a/guacamole/pom.xml b/guacamole/pom.xml index a4ca0c0ae..712be7210 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -50,20 +50,6 @@ scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git - - - - mike.jumper - Michael Jumper - mike.jumper@guac-dev.org - - - james.muehlner - James Muehlner - james.muehlner@guac-dev.org - - - UTF-8