Skip to content

Commit

Permalink
GUACAMOLE-436: Merge graduation-related website updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmuehlner
jmuehlner committed Nov 17, 2017
2 parents be3709c + 5e425b1 commit be79fdc
Show file tree
Hide file tree
Showing 10 changed files with 75 additions and 176 deletions.
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#

# Site settings
title: Apache Guacamole (incubating)
title: Apache Guacamole™

# Build settings
markdown: kramdown
Expand Down
17 changes: 3 additions & 14 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,9 @@

<!-- Trademarks -->
<p class="trademarks">
Apache and the Apache feather logo are trademarks of The Apache
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.
Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
Apache Guacamole project logo are trademarks of The Apache Software
Foundation.
</p>

</div>
25 changes: 12 additions & 13 deletions open-source.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ project, the first step is to be active in the community as a

Contributors who show merit through the quality of their continuing activity in
the community and their contributions to the project will be invited to become
[committers](#committers) or [members of the PPMC](#ppmc-members).
[committers](#committers) or [members of the PMC](#pmc-members).

Contributing {#contribute}
-----------------
Expand Down Expand Up @@ -81,8 +81,7 @@ Committers
Committers actively maintain and contribute to the Apache Guacamole project,
produce releases, review the code of contributors and fellow committers, and
identify contributors who have shown [merit](#meritocracy) and should be
offered committership. Apache Guacamole committers are also implicitly members
of the [Apache Guacamole PPMC](#ppmc-members).
offered committership.

Committers have write access to Apache Guacamole's git repositories, but do not
make direct changes on their own behalf. Code changes are made only through
Expand All @@ -104,19 +103,19 @@ a committer not otherwise directly involved in those changes.
* [Promoting a release candidate to release](/release-procedures-part3/)
* [Announcing the release](/release-procedures-part4/)

PPMC members
------------
PMC members
-----------

The Apache Guacamole PPMC is responsible for project oversight. PPMC members
participate in discussions on the [mailing lists](/support/#mailing-lists) and
vote on release candidates, new committers, and new PPMC members. Like
[committers](#committers) (who are implicitly PPMC members), the PPMC is
responsible for identifying members of the community who have shown
[merit](#meritocracy) warranting committership or PPMC membership.
The Apache Guacamole PMC is made up of committers and is responsible for
project oversight. PMC members participate in discussions on the [mailing
lists](/support/#mailing-lists) and vote on release candidates, new committers,
and new PMC members. The PMC is responsible for identifying members of the
community who have shown [merit](#meritocracy) warranting committership and/or
PMC membership.

### Resources for PPMC members:
### Resources for PMC members:

* [Apache Guacamole mailing lists](/support/#mailing-lists)
* [Apache Incubator: PPMC guide](http://incubator.apache.org/guides/ppmc.html)
* [Project Management Committee Guide](http://www.apache.org/dev/pmc.html)
* [Apache voting process](http://apache.org/foundation/voting.html)

6 changes: 3 additions & 3 deletions pull-requests.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ to:
the main repository.

Once this is done, the ASF git bot should kick in, and emails should go out
across the <commits@guacamole.incubator.apache.org> list noting each commit
across the <commits@guacamole.apache.org> list noting each commit
pushed. If this does not happen, or the commits show up only within the ASF
repositories and not the GitHub mirrors, it may be necessary to reach out to
[Infra](https://www.apache.org/dev/infrastructure.html) by opening an issue
Expand All @@ -98,8 +98,8 @@ Merging release-specific changes involves:

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
Expand Down
5 changes: 2 additions & 3 deletions release-procedure-part1.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Create a discussion thread for the release {#discuss-thread}
Beginning a new release candidate should not be a unilateral decision. There is
no requirement that an official vote be held prior to starting a release
candidate, but there needs to be some discussion via a `[DISCUSS]` thread on
<dev@guacamole.incubator.apache.org> to gauge whether the time is right for a
release.
<dev@guacamole.apache.org> to gauge whether the time is right for a release.

Development of Apache Guacamole is not halted when a release is being prepared,
but the main development tree is forked. With this in mind, it is best to only
Expand All @@ -41,7 +40,7 @@ contents of the release to remain within the agreed scope.

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)
Expand Down
110 changes: 20 additions & 90 deletions release-procedure-part2.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ a new release candidate. These tags are made off the release branch (*not* off
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
Expand Down Expand Up @@ -117,18 +117,18 @@ uploaded individually using the `gpg:sign-and-deploy-file` mojo:
$ 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`,
Expand All @@ -140,22 +140,22 @@ needs to be uploaded. The command for this is slightly different:
-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
https://repository.apache.org/, locate the staging repository which was
automatically created, and verify things look as expected. Assuming everything
looks good, select close staging repository to make it publicly available; the
URL of the repository will need to be provided in the various VOTE emails.
URL of the repository will need to be provided in the VOTE email.

### Docker images

Both guacamole-client and guacamole-server have associated Docker images which
are produced along with releases as a form of convenience binaries. These
images are `guacamole/guacamole` and `guacamole/guacd` respectively, both
hosted under the Apache Guacamole project's [Docker Hub
account](http://guacamole.incubator.apache.org/releases/).
account](https://hub.docker.com/u/guacamole/).

When building the Docker images, keep in mind:

Expand All @@ -173,15 +173,15 @@ release candidate, from within the top-level `incubator-guacamole-client`
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}
-----------------------------------------------------

The draft release notes and updated documentation both need to be uploaded to
the website prior to [calling the PPMC vote](#ppmc-vote). These changes should
the website prior to [calling the PMC vote](#pmc-vote). These changes should
be handled like any other website changes - via pull requests against the
`incubator-guacamole-website` repository. **DO NOT UPDATE THE TOP-LEVEL
DOCUMENTATION SYMBOLIC LINKS!** The top-level symbolic links in the `doc/`
Expand All @@ -207,12 +207,12 @@ Examples:
release notes for 0.9.10-incubating-RC3](https://github.com/apache/incubator-guacamole-website/blob/67adf0802701d696f9dc1a90229da694f4cebbaa/_releases/0.9.10-incubating.md)
* [The updated documentation for 0.9.10-incubating](https://github.com/apache/incubator-guacamole-website/tree/master/doc/0.9.10-incubating)

Create the PPMC `[VOTE]` thread {#ppmc-vote}
--------------------------------------------
Create the PMC `[VOTE]` thread {#ppmc-vote}
-------------------------------------------

Once the above has been completed, request a vote with an email to
<dev@guacamole.incubator.apache.org> titled `[VOTE] Release Apache Guacamole
[VERSION] (RC[N])`, containing the following:
<dev@guacamole.apache.org> titled `[VOTE] Release Apache Guacamole [VERSION]
(RC[N])`, containing the following:

```
Hello all,
Expand All @@ -222,7 +222,7 @@ uploaded and is ready for VOTE. The draft release notes (along with links
to artifacts, signatures/checksums, and updated documentation) can be found
here:
http://guacamole.incubator.apache.org/releases/[VERSION]/
http://guacamole.apache.org/releases/[VERSION]/
The git tag for all relevant repositories is "[VERSION]-RC[N]":
Expand All @@ -233,7 +233,7 @@ https://github.com/apache/incubator-guacamole-manual/tree/[VERSION]-RC[N]
Build instructions are included in the manual, which is part of the updated
documentation referenced above. For convenience:
http://guacamole.incubator.apache.org/doc/[VERSION]/gug/installing-guacamole.html
http://guacamole.apache.org/doc/[VERSION]/gug/installing-guacamole.html
Maven artifacts for guacamole-common, guacamole-common-js, and
guacamole-ext can be found in the following staging repository:
Expand All @@ -242,11 +242,11 @@ guacamole-ext can be found in the following staging repository:
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:
Expand All @@ -269,7 +269,7 @@ associated with the PGP key used to sign the release artifacts, and `[YOU]` is
your name. Obviously, alter the email as necessary if the scope of the release
is different.

Please note that, though community input is welcome, *only PPMC votes count
Please note that, though community input is welcome, *only PMC votes count
toward the required three "+1" votes*.

Example: [the 0.9.10-incubating-RC3 PPMC VOTE email](http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/201612.mbox/%3CCALKeL-PKQxOYqZCvhH6_ZF33Zo_LUZjLVZzTh%2B0VRipgsNxQ1g%40mail.gmail.com%3E)
Expand All @@ -278,73 +278,3 @@ If any release-blocking issues are discovered, the vote must be canceled and
development must resume, followed by another release candidate (prepared as
above) intended to address those issues.


Create the IPMC `[VOTE]` thread {#ipmc-vote}
--------------------------------------------

If/when the PPMC vote passes, another vote must be started for the IPMC. Only
IPMC votes are binding here. Send an email to <general@incubator.apache.org>
titled `[VOTE] Release Apache Guacamole [VERSION] (RC[N])` containing the
following:

```
Hello Incubator PMC,
The Apache Guacamole community has voted on and approved a proposal to
release Apache Guacamole [VERSION].
We now kindly request that the Incubator PMC members review and vote
on this incubator release.
The VOTE RESULT is here:
[LINK TO VOTE RESULT]
The draft release notes (along with links to artifacts,
signatures/checksums, and updated documentation) can be found here:
http://guacamole.incubator.apache.org/releases/[VERSION]/
The git tag for all relevant repositories is "[VERSION]-RC[N]":
https://github.com/apache/incubator-guacamole-client/tree/[VERSION]-RC[N]
https://github.com/apache/incubator-guacamole-server/tree/[VERSION]-RC[N]
https://github.com/apache/incubator-guacamole-manual/tree/[VERSION]-RC[N]
Build instructions are included in the manual, which is part of the
updated documentation referenced above. For convenience:
http://guacamole.incubator.apache.org/doc/[VERSION]/gug/installing-guacamole.html
Maven artifacts for guacamole-common, guacamole-common-js, and
guacamole-ext can be found in the following staging repository:
[STAGING REPOSITORY URL]
Source and binary distributions (also linked within the release notes):
https://dist.apache.org/repos/dist/dev/incubator/guacamole/[VERSION-RC[N]/
Artifacts have been signed with the "[EMAIL]" key listed in:
https://dist.apache.org/repos/dist/dev/incubator/guacamole/KEYS
Please review and vote:
[ ] +1 Approve the release
[ ] -1 Don't approve the release (please provide specific comments)
This vote will be open for at least 72 hours.
Thanks,
[YOU]
```

Where `[LINK TO VOTE RESULT]` the permalink to the specific email calling the
result of [the PPMC vote](#ppmc-vote) on the [public archive of
dev@guacamole.incubator.org](http://mail-archives.apache.org/mod_mbox/incubator-guacamole-dev/),
and all other fields are as described for [the PPMC vote email](#ppmc-vote).

Example: [the 0.9.10-incubating-RC3 IPMC VOTE email](http://mail-archives.apache.org/mod_mbox/incubator-general/201612.mbox/%3CCALKeL-MQmTi1fW%2BGsvFvN21D-ECfHEpf7hwQN5rB-U1JmfAXtQ%40mail.gmail.com%3E)

Loading

0 comments on commit be79fdc

Please sign in to comment.