You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/05/14 23:51:32 UTC
commons-collections git commit: Prepare for release while testing
build and release plugins.
Repository: commons-collections
Updated Branches:
refs/heads/master bcc005a0f -> a047296d3
Prepare for release while testing build and release plugins.
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/a047296d
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/a047296d
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/a047296d
Branch: refs/heads/master
Commit: a047296d3ea56144e5a118c0cb79adcd79fa5edc
Parents: bcc005a
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon May 14 17:51:28 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon May 14 17:51:28 2018 -0600
----------------------------------------------------------------------
README.md | 10 ++--
pom.xml | 11 ++++-
src/site/xdoc/download_collections.xml | 76 ++++++++++++++---------------
src/site/xdoc/mail-lists.xml | 8 +--
4 files changed, 56 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a047296d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 71e0963..7028e3c 100644
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@
Apache Commons Collections
===================
-[](https://travis-ci.org/apache/commons-collections4)
-[](https://coveralls.io/r/apache/commons-collections4)
+[](https://travis-ci.org/apache/commons-collections)
+[](https://coveralls.io/r/apache/commons-collections)
[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-collections4/)
[](https://javadoc.io/doc/org.apache.commons/commons-collections4/4.2)
@@ -53,13 +53,13 @@ ${project.description}
Documentation
-------------
-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.
+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.
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-collections4/download_collections4.cgi).
+You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-collections/download_collections.cgi).
Alternatively you can pull it from the central Maven repositories:
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a047296d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 64eeebd..c66d822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,7 +476,7 @@
<maven.compiler.target>1.7</maven.compiler.target>
<!--
- This is also used to generate download_xxx file name.
+ This is also used to generate download_xxx file name.
To override this when generating the download page:
mvn commons:download-page -Dcommons.componentid=collections
@@ -484,7 +484,7 @@
The above seems to change the download page name but not any other
properties that depend on the componentid.
-->
- <commons.componentid>collections4</commons.componentid>
+ <commons.componentid>collections</commons.componentid>
<commons.module.name>org.apache.commons.collections4</commons.module.name>
<!-- Current 4.x release series -->
@@ -518,6 +518,13 @@
<!-- Override jacoco for java 9 compatibility -->
<commons.jacoco.version>0.7.9</commons.jacoco.version>
+
+ <!--Used to generate the VOTE file, and can optionally be used with Clirr and JAmpiCmp -->
+ <commons.bc.version>4.1</commons.bc.version>
+
+ <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
+ <commons.releaseManagerKey>86FDC7E2A11262CB</commons.releaseManagerKey>
+
</properties>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a047296d/src/site/xdoc/download_collections.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download_collections.xml b/src/site/xdoc/download_collections.xml
index e705967..a3fc72d 100644
--- a/src/site/xdoc/download_collections.xml
+++ b/src/site/xdoc/download_collections.xml
@@ -115,28 +115,28 @@ limitations under the License.
<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>
+ <td><a href="[preferred]/commons/collections/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/collections/binaries/commons-collections4-4.2-bin.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/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>
+ <td><a href="[preferred]/commons/collections/binaries/commons-collections4-4.2-bin.zip">commons-collections4-4.2-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections4-4.2-bin.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/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>
+ <td><a href="[preferred]/commons/collections/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/collections/source/commons-collections4-4.2-src.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/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>
+ <td><a href="[preferred]/commons/collections/source/commons-collections4-4.2-src.zip">commons-collections4-4.2-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections4-4.2-src.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections4-4.2-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
@@ -145,28 +145,28 @@ limitations under the License.
<subsection name="Binaries">
<table>
<tr>
- <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>
+ <td><a href="[preferred]/commons/collections/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/collections/binaries/commons-collections-4.1-bin.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-4.1-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <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>
+ <td><a href="[preferred]/commons/collections/binaries/commons-collections-4.1-bin.zip">commons-collections-4.1-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-4.1-bin.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-4.1-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <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>
+ <td><a href="[preferred]/commons/collections/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/collections/source/commons-collections-4.1-src.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-4.1-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <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>
+ <td><a href="[preferred]/commons/collections/source/commons-collections-4.1-src.zip">commons-collections-4.1-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-4.1-src.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-4.1-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
@@ -175,28 +175,28 @@ limitations under the License.
<subsection name="Binaries">
<table>
<tr>
- <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>
+ <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="https://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <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>
+ <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="https://www.apache.org/dist/commons/collections/binaries/commons-collections-3.2.2-bin.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/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/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>
+ <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="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <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>
+ <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="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.sha1">sha1</a></td>
+ <td><a href="https://www.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
@@ -206,8 +206,8 @@ limitations under the License.
Older releases can be obtained from the archives.
</p>
<ul>
- <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>
+ <li class="download"><a href="[preferred]/commons/collections/">browse download area</a></li>
+ <li><a href="https://archive.apache.org/dist/commons/collections/">archives...</a></li>
</ul>
</section>
</body>
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/a047296d/src/site/xdoc/mail-lists.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index 2355573..164dd3c 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -54,7 +54,7 @@ limitations under the License.
the convention in Commons is to prefix the subject line of messages with the component's name,
for example:
<ul>
- <li>[collections4] Problem with the ...</li>
+ <li>[collections] Problem with the ...</li>
</ul>
</p>
<p>
@@ -79,7 +79,7 @@ limitations under the License.
<section name="Apache Commons Collections Mailing Lists">
<p>
<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>
+ with <i>[collections]</i></strong> - <i>thanks!</i>
<br />
<br />
</p>
@@ -104,7 +104,7 @@ limitations under the License.
</td>
<td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
<td><a href="mailto:user-unsubscribe@commons.apache.org">Unsubscribe</a></td>
- <td><a href="mailto:user@commons.apache.org?subject=[collections4]">Post</a></td>
+ <td><a href="mailto:user@commons.apache.org?subject=[collections]">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/user@commons.apache.org/">www.mail-archive.com</a><br />
@@ -122,7 +122,7 @@ limitations under the License.
</td>
<td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
<td><a href="mailto:dev-unsubscribe@commons.apache.org">Unsubscribe</a></td>
- <td><a href="mailto:dev@commons.apache.org?subject=[collections4]">Post</a></td>
+ <td><a href="mailto:dev@commons.apache.org?subject=[collections]">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/dev@commons.apache.org/">www.mail-archive.com</a><br />