Repository: commons-collections Updated Branches: refs/heads/master 97842394d -> bcc005a0f
Prepare for next release. Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/bcc005a0 Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/bcc005a0 Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/bcc005a0 Branch: refs/heads/master Commit: bcc005a0fd6b99637adf46a04dc2d02632a0c7f0 Parents: 9784239 Author: Gary Gregory <[email protected]> Authored: Sun May 13 10:30:15 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Sun May 13 10:30:15 2018 -0600 ---------------------------------------------------------------------- CONTRIBUTING.md | 4 +- README.md | 18 +++-- src/site/xdoc/download_collections.xml | 116 +++++++++++++++++++--------- src/site/xdoc/issue-tracking.xml | 54 ++++++------- src/site/xdoc/mail-lists.xml | 67 ++++++++-------- 5 files changed, 155 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-collections/blob/bcc005a0/CONTRIBUTING.md ---------------------------------------------------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 536b111..9b1dda6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,7 +50,7 @@ Getting Started + Make sure you have a [JIRA account](https://issues.apache.org/jira/). + Make sure you have a [GitHub account](https://github.com/signup/free). -+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Collections's scope. ++ If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Collections's scope. + Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist. + Clearly describe the issue including steps to reproduce when it is a bug. + Make sure you fill in the earliest version that you know has the issue. @@ -107,7 +107,7 @@ Additional Resources + [Apache Commons Collections JIRA project page][jira] + [Contributor License Agreement][cla] + [General GitHub documentation](https://help.github.com/) -+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/) ++ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/) + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) + `#apache-commons` IRC channel on `irc.freenode.net` http://git-wip-us.apache.org/repos/asf/commons-collections/blob/bcc005a0/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 3664ad2..71e0963 100644 --- a/README.md +++ b/README.md @@ -42,22 +42,24 @@ ---> Apache Commons Collections =================== -[](https://travis-ci.org/apache/commons-collections) -[](https://coveralls.io/r/apache/commons-collections) + +[](https://travis-ci.org/apache/commons-collections4) +[](https://coveralls.io/r/apache/commons-collections4) [](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-collections4/) +[](https://javadoc.io/doc/org.apache.commons/commons-collections4/4.2) -The Apache Commons Collections package contains types that extend and augment the Java Collections Framework. +${project.description} Documentation ------------- -More information can be found on the [Apache Commons Collections homepage](https://commons.apache.org/proper/commons-collections). -The [JavaDoc](https://commons.apache.org/proper/commons-collections/javadocs/api-release) can be browsed. +More information can be found on the [Apache Commons Collections homepage](https://commons.apache.org/proper/commons-collections4). +The [JavaDoc](https://commons.apache.org/proper/commons-collections4/javadocs/api-release) can be browsed. Questions related to the usage of Apache Commons Collections should be posted to the [user mailing list][ml]. Where can I get the latest release? ----------------------------------- -You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-collections/download_collections.cgi). +You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-collections4/download_collections4.cgi). Alternatively you can pull it from the central Maven repositories: @@ -65,7 +67,7 @@ Alternatively you can pull it from the central Maven repositories: <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.1</version> + <version>4.2</version> </dependency> ``` @@ -96,7 +98,7 @@ Additional Resources -------------------- + [Apache Commons Homepage](https://commons.apache.org/) -+ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/browse/COLLECTIONS) ++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/COLLECTIONS) + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) + `#apache-commons` IRC channel on `irc.freenode.org` http://git-wip-us.apache.org/repos/asf/commons-collections/blob/bcc005a0/src/site/xdoc/download_collections.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/download_collections.xml b/src/site/xdoc/download_collections.xml index e43d9f0..e705967 100644 --- a/src/site/xdoc/download_collections.xml +++ b/src/site/xdoc/download_collections.xml @@ -31,10 +31,21 @@ limitations under the License. | 2) Set the following properties in the component's pom: | | - commons.componentid (required, alphabetic, lower case) | | - commons.release.version (required) | - | - commons.binary.suffix (optional) | + | - commons.release.name (required) | + | - commons.binary.suffix (optional) | | (defaults to "-bin", set to "" for pre-maven2 releases) | + | - commons.release.desc (optional) | + | - commons.release.subdir (optional) | + | | + | - commons.release.2/3.version (conditional) | + | - commons.release.2/3.name (conditional) | + | - commons.release.2/3.binary.suffix (optional) | + | - commons.release.2/3.desc (optional) | + | - commons.release.2/3.subdir (optional) | | | | 3) Example Properties | + | (commons.release.name inherited by parent: | + | ${project.artifactId}-${commons.release.version} | | | | <properties> | | <commons.componentid>math</commons.componentid> | @@ -46,17 +57,17 @@ limitations under the License. <document> <properties> <title>Download Apache Commons Collections</title> - <author email="[email protected]">Commons Documentation Team</author> + <author email="[email protected]">Apache Commons Documentation Team</author> </properties> <body> <section name="Download Apache Commons Collections"> <subsection name="Using a Mirror"> <p> We recommend you use a mirror to download our release - builds, but you <strong>must</strong> verify the integrity of + builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html";>verify the integrity</a> of the downloaded files using signatures downloaded from our main distribution directories. Recent releases (48 hours) may not yet - be available from the mirrors. + be available from all the mirrors. </p> <p> @@ -88,39 +99,74 @@ limitations under the License. </form> <p> - The <a href="http://www.apache.org/dist/commons/KEYS";>KEYS</a> - link links to the code signing keys used to sign the product. - The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site. - The <code>MD5</code> link downloads the checksum from the main site. + It is essential that you + <a href="https://www.apache.org/info/verification.html";>verify the integrity</a> + of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files); + failing that using the <code>SHA1</code> hash (<code>*.sha1</code> checksum files). + </p> + <p> + The <a href="https://www.apache.org/dist/commons/KEYS";>KEYS</a> + file contains the public PGP keys used by Apache Commons developers + to sign releases. </p> </subsection> </section> - <section name="Apache Commons Collections 4.1 (Java 6.0+)"> + <section name="Apache Commons Collections 4.2 (Requires Java 7 or later)"> + <subsection name="Binaries"> + <table> + <tr> + <td><a href="[preferred]/commons/collections4/binaries/commons-collections4-4.2-bin.tar.gz">commons-collections4-4.2-bin.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections4-4.2-bin.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections4-4.2-bin.tar.gz.asc";>pgp</a></td> + </tr> + <tr> + <td><a href="[preferred]/commons/collections4/binaries/commons-collections4-4.2-bin.zip">commons-collections4-4.2-bin.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections4-4.2-bin.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections4-4.2-bin.zip.asc";>pgp</a></td> + </tr> + </table> + </subsection> + <subsection name="Source"> + <table> + <tr> + <td><a href="[preferred]/commons/collections4/source/commons-collections4-4.2-src.tar.gz">commons-collections4-4.2-src.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections4-4.2-src.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections4-4.2-src.tar.gz.asc";>pgp</a></td> + </tr> + <tr> + <td><a href="[preferred]/commons/collections4/source/commons-collections4-4.2-src.zip">commons-collections4-4.2-src.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections4-4.2-src.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections4-4.2-src.zip.asc";>pgp</a></td> + </tr> + </table> + </subsection> + </section> + <section name="Apache Commons Collections 4.1 (Requires Java 6 or later)"> <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.1-bin.tar.gz">commons-collections4-4.1-bin.tar.gz</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.tar.gz.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/binaries/commons-collections-4.1-bin.tar.gz">commons-collections-4.1-bin.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-4.1-bin.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-4.1-bin.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.1-bin.zip">commons-collections4-4.1-bin.zip</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.zip.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.1-bin.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/binaries/commons-collections-4.1-bin.zip">commons-collections-4.1-bin.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-4.1-bin.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-4.1-bin.zip.asc";>pgp</a></td> </tr> </table> </subsection> <subsection name="Source"> <table> <tr> - <td><a href="[preferred]/commons/collections/source/commons-collections4-4.1-src.tar.gz">commons-collections4-4.1-src.tar.gz</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.tar.gz.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/source/commons-collections-4.1-src.tar.gz">commons-collections-4.1-src.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-4.1-src.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-4.1-src.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/collections/source/commons-collections4-4.1-src.zip">commons-collections4-4.1-src.zip</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.zip.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections4-4.1-src.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/source/commons-collections-4.1-src.zip">commons-collections-4.1-src.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-4.1-src.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-4.1-src.zip.asc";>pgp</a></td> </tr> </table> </subsection> @@ -129,28 +175,28 @@ limitations under the License. <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz">commons-collections-3.2.2-bin.tar.gz</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/binaries/commons-collections-3.2.2-bin.tar.gz">commons-collections-3.2.2-bin.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-3.2.2-bin.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-3.2.2-bin.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/collections/binaries/commons-collections-3.2.2-bin.zip">commons-collections-3.2.2-bin.zip</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.zip.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/binaries/commons-collections-3.2.2-bin.zip">commons-collections-3.2.2-bin.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-3.2.2-bin.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/binaries/commons-collections-3.2.2-bin.zip.asc";>pgp</a></td> </tr> </table> </subsection> <subsection name="Source"> <table> <tr> - <td><a href="[preferred]/commons/collections/source/commons-collections-3.2.2-src.tar.gz">commons-collections-3.2.2-src.tar.gz</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/source/commons-collections-3.2.2-src.tar.gz">commons-collections-3.2.2-src.tar.gz</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-3.2.2-src.tar.gz.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-3.2.2-src.tar.gz.asc";>pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/collections/source/commons-collections-3.2.2-src.zip">commons-collections-3.2.2-src.zip</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.md5";>md5</a></td> - <td><a href="http://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.asc";>pgp</a></td> + <td><a href="[preferred]/commons/collections4/source/commons-collections-3.2.2-src.zip">commons-collections-3.2.2-src.zip</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-3.2.2-src.zip.sha1";>sha1</a></td> + <td><a href="https://www.apache.org/dist/commons/collections4/source/commons-collections-3.2.2-src.zip.asc";>pgp</a></td> </tr> </table> </subsection> @@ -160,8 +206,8 @@ limitations under the License. Older releases can be obtained from the archives. </p> <ul> - <li class="download"><a href="[preferred]/commons/collections/">browse download area</a></li> - <li><a href="http://archive.apache.org/dist/commons/collections/";>archives...</a></li> + <li class="download"><a href="[preferred]/commons/collections4/">browse download area</a></li> + <li><a href="https://archive.apache.org/dist/commons/collections4/";>archives...</a></li> </ul> </section> </body> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/bcc005a0/src/site/xdoc/issue-tracking.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index 2c06da6..38a90af 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -1,19 +1,19 @@ <?xml version="1.0"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. --> <!-- +======================================================================+ @@ -43,35 +43,35 @@ --> <document> <properties> - <title>Commons Collections Issue tracking</title> - <author email="[email protected]">Commons Documentation Team</author> + <title>Apache Commons Collections Issue tracking</title> + <author email="[email protected]">Apache Commons Documentation Team</author> </properties> <body> - <section name="Commons Collections Issue tracking"> + <section name="Apache Commons Collections Issue tracking"> <p> - Commons Collections uses <a href="http://issues.apache.org/jira/";>ASF JIRA</a> for tracking issues. - See the <a href="http://issues.apache.org/jira/browse/COLLECTIONS";>Commons Collections JIRA project page</a>. + Apache Commons Collections uses <a href="https://issues.apache.org/jira/";>ASF JIRA</a> for tracking issues. + See the <a href="https://issues.apache.org/jira/browse/COLLECTIONS";>Apache Commons Collections JIRA project page</a>. </p> <p> - To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa";>create an account</a> + To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa";>create an account</a> (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically - created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa";>Forgot Password</a> + created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa";>Forgot Password</a> page to get a new password). </p> <p> If you would like to report a bug, or raise an enhancement request with - Commons Collections please do the following: + Apache Commons Collections please do the following: <ol> - <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>Search existing open bugs</a>. + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>Search existing open bugs</a>. If you find your issue listed then please add a comment with your details.</li> <li><a href="mail-lists.html">Search the mailing list archive(s)</a>. You may find your issue or idea has already been discussed.</li> <li>Decide if your issue is a bug or an enhancement.</li> - <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&issuetype=1&priority=4&assignee=-1";>bug report</a> - or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&issuetype=4&priority=4&assignee=-1";>enhancement request</a>.</li> + <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&issuetype=1&priority=4&assignee=-1";>bug report</a> + or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310465&issuetype=4&priority=4&assignee=-1";>enhancement request</a>.</li> </ol> </p> @@ -80,7 +80,7 @@ <ul> <li>the more information you provide, the better we can help you</li> <li>test cases are vital, particularly for any proposed enhancements</li> - <li>the developers of Commons Collections are all unpaid volunteers</li> + <li>the developers of Apache Commons Collections are all unpaid volunteers</li> </ul> </p> @@ -92,9 +92,9 @@ <p> You may also find these links useful: <ul> - <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>All Open Commons Collections bugs</a></li> - <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=5&status=6";>All Resolved Commons Collections bugs</a></li> - <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC";>All Commons Collections bugs</a></li> + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>All Open Apache Commons Collections bugs</a></li> + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC&status=5&status=6";>All Resolved Apache Commons Collections bugs</a></li> + <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310465&sorter/field=issuekey&sorter/order=DESC";>All Apache Commons Collections bugs</a></li> </ul> </p> </section> http://git-wip-us.apache.org/repos/asf/commons-collections/blob/bcc005a0/src/site/xdoc/mail-lists.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index db41789..2355573 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -1,19 +1,19 @@ <?xml version="1.0"?> <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. --> <!-- +======================================================================+ @@ -41,42 +41,45 @@ --> <document> <properties> - <title>Commons Collections Mailing Lists</title> - <author email="[email protected]">Commons Documentation Team</author> + <title>Apache Commons Collections Mailing Lists</title> + <author email="[email protected]">Apache Commons Documentation Team</author> </properties> <body> <section name="Overview"> <p> - <a href="index.html">Commons Collections</a> shares mailing lists with all the other + <a href="index.html">Apache Commons Collections</a> shares mailing lists with all the other <a href="http://commons.apache.org/components.html";>Commons Components</a>. To make it easier for people to only read messages related to components they are interested in, the convention in Commons is to prefix the subject line of messages with the component's name, for example: <ul> - <li>[collections] Problem with the ...</li> + <li>[collections4] Problem with the ...</li> </ul> </p> <p> - Questions related to the usage of Commons Collections should be posted to the + Questions related to the usage of Apache Commons Collections should be posted to the <a href="http://mail-archives.apache.org/mod_mbox/commons-user/";>User List</a>. <br /> The <a href="http://mail-archives.apache.org/mod_mbox/commons-dev/";>Developer List</a> - is for questions and discussion related to the development of Commons Collections. + is for questions and discussion related to the development of Apache Commons Collections. <br /> Please do not cross-post; developers are also subscribed to the user list. + <br /> + You must be subscribed to post to the mailing lists. Follow the Subscribe links below + to subscribe. </p> <p> <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists. - Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system. - Otherwise, please upload the file to a public server and include the URL in the mail. + Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system. + Otherwise, please upload the file to a public server and include the URL in the mail. </p> </section> - <section name="Commons Collections Mailing Lists"> + <section name="Apache Commons Collections Mailing Lists"> <p> - <strong>Please prefix the subject line of any messages for <a href="index.html">Commons Collections</a> - with <i>[collections]</i></strong> - <i>thanks!</i> + <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons Collections</a> + with <i>[collections4]</i></strong> - <i>thanks!</i> <br /> <br /> </p> @@ -96,12 +99,12 @@ <td> <strong>Commons User List</strong> <br /><br /> - Questions on using Commons Collections. + Questions on using Apache Commons Collections. <br /><br /> </td> <td><a href="mailto:[email protected]";>Subscribe</a></td> <td><a href="mailto:[email protected]";>Unsubscribe</a></td> - <td><a href="mailto:[email protected]?subject=[collections]";>Post</a></td> + <td><a href="mailto:[email protected]?subject=[collections4]";>Post</a></td> <td><a href="http://mail-archives.apache.org/mod_mbox/commons-user/";>mail-archives.apache.org</a></td> <td><a href="http://markmail.org/list/org.apache.commons.users/";>markmail.org</a><br /> <a href="http://www.mail-archive.com/[email protected]/";>www.mail-archive.com</a><br /> @@ -114,12 +117,12 @@ <td> <strong>Commons Developer List</strong> <br /><br /> - Discussion of development of Commons Collections. + Discussion of development of Apache Commons Collections. <br /><br /> </td> <td><a href="mailto:[email protected]";>Subscribe</a></td> <td><a href="mailto:[email protected]";>Unsubscribe</a></td> - <td><a href="mailto:[email protected]?subject=[collections]";>Post</a></td> + <td><a href="mailto:[email protected]?subject=[collections4]";>Post</a></td> <td><a href="http://mail-archives.apache.org/mod_mbox/commons-dev/";>mail-archives.apache.org</a></td> <td><a href="http://markmail.org/list/org.apache.commons.dev/";>markmail.org</a><br /> <a href="http://www.mail-archive.com/[email protected]/";>www.mail-archive.com</a><br /> @@ -185,10 +188,10 @@ General announcements of Apache project releases. <br /><br /> </td> - <td><a class="externalLink" href="mailto:[email protected]";>Subscribe</a></td> - <td><a class="externalLink" href="mailto:[email protected]";>Unsubscribe</a></td> + <td><a class="externalLink" href="mailto:[email protected]";>Subscribe</a></td> + <td><a class="externalLink" href="mailto:[email protected]";>Unsubscribe</a></td> <td><i>read only</i></td> - <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/";>mail-archives.apache.org</a></td> + <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/";>mail-archives.apache.org</a></td> <td><a class="externalLink" href="http://markmail.org/list/org.apache.announce/";>markmail.org</a><br /> <a class="externalLink" href="http://old.nabble.com/Apache-News-and-Announce-f109.html";>old.nabble.com</a><br /> <a class="externalLink" href="http://www.mail-archive.com/[email protected]/";>www.mail-archive.com</a><br />
