GUACAMOLE-436: Remove disclaimer and "incubating" - we've graduated.
diff --git a/README.md b/README.md
index 8123f89..ea1f048 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,8 @@
The Apache Guacamole website
============================
-This repository contains the source for the website of Apache Guacamole, a
-clientless remote desktop solution currently undergoing incubation at the
-Apache Incubator.
+This repository contains the source for the website of [Apache
+Guacamole](http://guacamole.apache.org/), a clientless remote desktop gateway.
The website itself is completely static, being automatically generated by
[Jekyll](https://jekyllrb.com/) prior to deployment. The content of the website
diff --git a/_config.yml b/_config.yml
index dd1d0f1..f319d18 100644
--- a/_config.yml
+++ b/_config.yml
@@ -18,7 +18,7 @@
#
# Site settings
-title: Apache Guacamole (incubating)
+title: Apache Guacamole
# Build settings
markdown: kramdown
diff --git a/_includes/footer.html b/_includes/footer.html
index 77f06b9..2c18906 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -20,16 +20,4 @@
Software Foundation.
</p>
- <!-- Incubation disclaimer -->
- <p class="disclaimer">
- Apache Guacamole is an effort undergoing Incubation at The Apache
- Software Foundation (ASF), sponsored by the Incubator. 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.
- </p>
-
</div>
diff --git a/pull-requests.md b/pull-requests.md
index 2fec30b..4d356ea 100644
--- a/pull-requests.md
+++ b/pull-requests.md
@@ -98,8 +98,8 @@
2. Merging the **staging branch** to **`master`**. Doing this is largely the
same as described above, except that there is inherently no JIRA issue to
- tag in the commit message. A message like "Merging 0.9.10-incubating
- changes back to master." is pretty sensible.
+ tag in the commit message. A message like "Merging 0.9.10 changes back to
+ master." is pretty sensible.
**DO NOT MERGE THE PULL REQUEST TO MASTER DIRECTLY!** The point of merging
the staging branch to master rather than the pull request is to ensure that
diff --git a/release-procedure-part1.md b/release-procedure-part1.md
index fee1851..cb75bb8 100644
--- a/release-procedure-part1.md
+++ b/release-procedure-part1.md
@@ -41,7 +41,7 @@
Create a new `staging/[VERSION]` branch for each of the following repositories,
where `[VERSION]` is the version of the upcoming release, such as
-"0.9.11-incubating":
+"0.9.11":
* [`incubator-guacamole-client`](https://github.com/apache/incubator-guacamole-client)
* [`incubator-guacamole-server`](https://github.com/apache/incubator-guacamole-server)
diff --git a/release-procedure-part2.md b/release-procedure-part2.md
index 07e0398..abe2997 100644
--- a/release-procedure-part2.md
+++ b/release-procedure-part2.md
@@ -17,8 +17,8 @@
version of the upcoming release and `[N]` is the number of the release
candidate:
- $ git tag -m "Release 0.9.11-incubating - RC1." 0.9.11-incubating-RC1
- $ git push upstream 0.9.11-incubating-RC1
+ $ git tag -m "Release 0.9.11 - RC1." 0.9.11-RC1
+ $ git push upstream 0.9.11-RC1
Each repository relevant to the release must be tagged. At this point, this
will be every repository that has a release branch. This *never* includes
@@ -117,18 +117,18 @@
$ mvn gpg:sign-and-deploy-file \
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache -DpomFile=guacamole-common/pom.xml \
- -Dfile=guacamole-common/target/guacamole-common-0.9.10-incubating.jar
+ -Dfile=guacamole-common/target/guacamole-common-0.9.10.jar
$ mvn gpg:sign-and-deploy-file \
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache -DpomFile=guacamole-common/pom.xml \
- -Dfile=guacamole-common/target/guacamole-common-0.9.10-incubating-javadoc.jar \
+ -Dfile=guacamole-common/target/guacamole-common-0.9.10-javadoc.jar \
-Dclassifier=javadoc
$ mvn gpg:sign-and-deploy-file \
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache -DpomFile=guacamole-common/pom.xml \
- -Dfile=guacamole-common/target/guacamole-common-0.9.10-incubating-sources.jar \
+ -Dfile=guacamole-common/target/guacamole-common-0.9.10-sources.jar \
-Dclassifier=sources
The above will need to be done for both `guacamole-common` and `guacamole-ext`,
@@ -140,7 +140,7 @@
-Durl=https://repository.apache.org/service/local/staging/deploy/maven2 \
-DrepositoryId=apache \
-DpomFile=guacamole-common-js/pom.xml \
- -Dfile=guacamole-common-js/target/guacamole-common-js-0.9.10-incubating.zip \
+ -Dfile=guacamole-common-js/target/guacamole-common-js-0.9.10.zip \
-Dpackaging=zip
Once everything has been uploaded, log into Apache's Nexus at
@@ -173,8 +173,8 @@
directory:
$ git clean -xfd .
- $ sudo docker build -t guacamole/guacamole:0.9.11-incubating-RC1 .
- $ sudo docker push guacamole/guacamole:0.9.11-incubating-RC1
+ $ sudo docker build -t guacamole/guacamole:0.9.11-RC1 .
+ $ sudo docker push guacamole/guacamole:0.9.11-RC1
Upload documentation and release notes {#upload-docs}
@@ -242,11 +242,11 @@
Source and binary distributions (also linked within the release notes):
-https://dist.apache.org/repos/dist/dev/incubator/guacamole/[VERSION]-RC[N]/
+https://dist.apache.org/repos/dist/dev/guacamole/[VERSION]-RC[N]/
Artifacts have been signed with the "[EMAIL]" key listed in:
-https://dist.apache.org/repos/dist/dev/incubator/guacamole/KEYS
+https://dist.apache.org/repos/dist/dev/guacamole/KEYS
Please review and vote:
diff --git a/release-procedure-part3.md b/release-procedure-part3.md
index ecb140c..f9e233b 100644
--- a/release-procedure-part3.md
+++ b/release-procedure-part3.md
@@ -21,8 +21,8 @@
rechecked**.
$ git checkout master
- $ git branch -d staging/0.9.11-incubating
- $ git push upstream :staging/0.9.11-incubating
+ $ git branch -d staging/0.9.11
+ $ git push upstream :staging/0.9.11
Tag the final version of the release {#final-tag}
-------------------------------------------------
@@ -32,8 +32,8 @@
candidate](/release-procedures-part2/#tag-rc). This tag must be made in the
format `[VERSION]`, where `[VERSION]` is the version of the release:
- $ git tag -m "Release 0.9.11-incubating." 0.9.11-incubating
- $ git push upstream 0.9.11-incubating
+ $ git tag -m "Release 0.9.11." 0.9.11
+ $ git push upstream 0.9.11
Just as with release candidates, each repository relevant to the release must
be tagged. This will be every repository that had a release branch (the release
@@ -56,8 +56,8 @@
containing the artifacts and signatures being renamed from `[VERSION]-RC[N]` to
`[VERSION`] in the process.
- $ svn mv dev/incubator/guacamole/0.9.11-incubating-RC1 release/incubator/guacamole/0.9.11-incubating
- $ svn commit -m "Promote Apache Guacamole 0.9.11-incubating-RC1 artifacts to 0.9.11-incubating release."
+ $ svn mv dev/guacamole/0.9.11-RC1 release/guacamole/0.9.11
+ $ svn commit -m "Promote Apache Guacamole 0.9.11-RC1 artifacts to 0.9.11 release."
Note that, once this has finished, **YOU MUST STILL WAIT AT LEAST 24 HOURS TO
ALLOW THE [MIRRORS](https://www.apache.org/mirrors/) TIME TO SYNC** before
@@ -93,14 +93,14 @@
directory:
$ git clean -xfd .
- $ sudo docker build -t guacamole/guacamole:0.9.11-incubating .
+ $ sudo docker build -t guacamole/guacamole:0.9.11 .
$ sudo docker build -t guacamole/guacamole:latest .
Each of the above commands should finish virtually instantaneously, and the
hash of the built images should match each other and the previous RC. Assuming
all looks well, it should be safe to push the images:
- $ sudo docker push guacamole/guacamole:0.9.11-incubating
+ $ sudo docker push guacamole/guacamole:0.9.11
$ sudo docker push guacamole/guacamole:latest
Again, this should finish virtually instantaneously, as no new data will need
diff --git a/release-procedure-part4.md b/release-procedure-part4.md
index cc43c6e..a6766e6 100644
--- a/release-procedure-part4.md
+++ b/release-procedure-part4.md
@@ -54,11 +54,10 @@
The Apache Guacamole community is proud to announce the release of Apache
Guacamole [VERSION].
-Apache Guacamole (incubating) is a clientless remote desktop gateway which
-supports standard protocols like VNC, RDP, and SSH. We call it "clientless"
-because no plugins or client software are required; once Guacamole is
-installed on a server, all you need to access your desktops is a web
-browser.
+Apache Guacamole is a clientless remote desktop gateway which supports
+standard protocols like VNC, RDP, and SSH. We call it "clientless" because no
+plugins or client software are required; once Guacamole is installed on a
+server, all you need to access your desktops is a web browser.
[VERSION] features [RELEASE HIGHLIGHTS].
@@ -73,20 +72,7 @@
Thanks!
-The Apache Guacamole (incubating) Community
-
-----
-
-DISCLAIMER:
-
-Apache Guacamole is an effort undergoing Incubation at The Apache Software
-Foundation (ASF), sponsored by the Incubator. 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.
+The Apache Guacamole Community
```
Where `[VERSION]` is the version that was just released and `[RELEASE
