Skip to content

Commit f1b8e1b

Browse files
committed
Update for next release.
1 parent eea0f8c commit f1b8e1b

7 files changed

Lines changed: 141 additions & 89 deletions

File tree

CONTRIBUTING.md

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
2626
+======================================================================+
2727
| |
28-
| 1) Re-generate using: mvn commons:contributing-md |
28+
| 1) Re-generate using: mvn commons-build:contributing-md |
2929
| |
3030
| 2) Set the following properties in the component's pom: |
3131
| - commons.jira.id (required, alphabetic, upper case) |
@@ -51,47 +51,65 @@ Getting Started
5151
+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
5252
+ Make sure you have a [GitHub account](https://github.com/signup/free).
5353
+ 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 CLI's scope.
54-
+ Submit a ticket for your issue, assuming one does not already exist.
54+
+ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
5555
+ Clearly describe the issue including steps to reproduce when it is a bug.
5656
+ Make sure you fill in the earliest version that you know has the issue.
57-
+ Fork the repository on GitHub.
57+
+ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
58+
[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
5859

5960
Making Changes
6061
--------------
6162

62-
+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
63+
+ Create a _topic branch_ for your isolated work.
64+
* Usually you should base your branch on the `master` or `trunk` branch.
65+
* A good topic branch name can be the JIRA bug id plus a keyword, e.g. `CLI-123-InputStream`.
66+
* If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
6367
+ Make commits of logical units.
68+
* Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
69+
* e.g. `CLI-123: Close input stream earlier`
6470
+ Respect the original code style:
6571
+ Only use spaces for indentation.
66-
+ Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
67-
+ Check for unnecessary whitespace with git diff --check before committing.
68-
+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
69-
+ Make sure you have added the necessary tests for your changes.
72+
+ Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.
73+
+ Check for unnecessary whitespace with `git diff` -- check before committing.
74+
+ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
7075
+ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
7176

7277
Making Trivial Changes
7378
----------------------
7479

80+
The JIRA tickets are used to generate the changelog for the next release.
81+
7582
For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
7683
In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
7784

85+
7886
Submitting Changes
7987
------------------
8088

81-
+ Sign the [Contributor License Agreement][cla] if you haven't already.
89+
+ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
90+
* Note that small patches & typical bug fixes do not require a CLA as
91+
clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
92+
covers them.
8293
+ Push your changes to a topic branch in your fork of the repository.
83-
+ Submit a pull request to the repository in the apache organization.
94+
+ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
95+
* Verify _Files Changed_ shows only your intended changes and does not
96+
include additional files like `target/*.class`
8497
+ Update your JIRA ticket and include a link to the pull request in the ticket.
8598

99+
If you prefer to not use GitHub, then you can instead use
100+
`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
101+
102+
86103
Additional Resources
87104
--------------------
88105

89106
+ [Contributing patches](https://commons.apache.org/patches.html)
90-
+ [Apache Commons CLI JIRA project page](https://issues.apache.org/jira/browse/CLI)
107+
+ [Apache Commons CLI JIRA project page][jira]
91108
+ [Contributor License Agreement][cla]
92109
+ [General GitHub documentation](https://help.github.com/)
93-
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
110+
+ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
94111
+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
95-
+ #apachecommons IRC channel on freenode.org
112+
+ `#apache-commons` IRC channel on `irc.freenode.net`
96113

97114
[cla]:https://www.apache.org/licenses/#clas
115+
[jira]:https://issues.apache.org/jira/browse/CLI

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Commons CLI
2-
Copyright 2001-2019 The Apache Software Foundation
2+
Copyright 2002-2021 The Apache Software Foundation
33

44
This product includes software developed at
5-
The Apache Software Foundation (http://www.apache.org/).
5+
The Apache Software Foundation (https://www.apache.org/).

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
2626
+======================================================================+
2727
| |
28-
| 1) Re-generate using: mvn commons:readme-md |
28+
| 1) Re-generate using: mvn commons-build:readme-md |
2929
| |
3030
| 2) Set the following properties in the component's pom: |
3131
| - commons.componentid (required, alphabetic, lower case) |
@@ -43,18 +43,19 @@
4343
Apache Commons CLI
4444
===================
4545

46-
[![Build Status](https://travis-ci.org/apache/commons-cli.svg)](https://travis-ci.org/apache/commons-cli)
46+
[![Travis-CI Status](https://travis-ci.org/apache/commons-cli.svg)](https://travis-ci.org/apache/commons-cli)
47+
[![GitHub Actions Status](https://github.com/apache/commons-cli/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-cli/actions)
4748
[![Coverage Status](https://coveralls.io/repos/apache/commons-cli/badge.svg)](https://coveralls.io/r/apache/commons-cli)
4849
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/badge.svg)](https://maven-badges.herokuapp.com/maven-central/commons-cli/commons-cli/)
49-
[![Javadocs](https://javadoc.io/badge/commons-cli/commons-cli/1.4.svg)](https://javadoc.io/doc/commons-cli/commons-cli/1.4)
50+
[![Javadocs](https://javadoc.io/badge/commons-cli/commons-cli/1.5.svg)](https://javadoc.io/doc/commons-cli/commons-cli/1.5)
5051

51-
Apache Commons CLI provides a simple API for presenting, processing and validating a command line interface.
52+
Apache Commons CLI provides a simple API for presenting, processing and validating a Command Line Interface.
5253

5354
Documentation
5455
-------------
5556

5657
More information can be found on the [Apache Commons CLI homepage](https://commons.apache.org/proper/commons-cli).
57-
The [Javadoc](https://commons.apache.org/proper/commons-cli/javadocs/api-release) can be browsed.
58+
The [Javadoc](https://commons.apache.org/proper/commons-cli/apidocs) can be browsed.
5859
Questions related to the usage of Apache Commons CLI should be posted to the [user mailing list][ml].
5960

6061
Where can I get the latest release?
@@ -67,7 +68,7 @@ Alternatively you can pull it from the central Maven repositories:
6768
<dependency>
6869
<groupId>commons-cli</groupId>
6970
<artifactId>commons-cli</artifactId>
70-
<version>1.4</version>
71+
<version>1.5</version>
7172
</dependency>
7273
```
7374

pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@
224224
<clirr.skip>true</clirr.skip>
225225
<findbugs.skip>true</findbugs.skip>
226226
<japicmp.skip>false</japicmp.skip>
227+
<commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
228+
<commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
227229
</properties>
228230

229231
<build>

src/site/xdoc/download_cli.xml

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,28 @@ limitations under the License.
2626
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
2727
+======================================================================+
2828
| |
29-
| 1) Re-generate using: mvn commons:download-page |
29+
| 1) Re-generate using: mvn commons-build:download-page |
3030
| |
3131
| 2) Set the following properties in the component's pom: |
32-
| - commons.componentid (required, alphabetic, lower case) |
32+
| - commons.componentid (required, alphabetic, lower case) |
3333
| - commons.release.version (required) |
34-
| - commons.binary.suffix (optional) |
34+
| - commons.release.name (required) |
35+
| - commons.binary.suffix (optional) |
3536
| (defaults to "-bin", set to "" for pre-maven2 releases) |
37+
| - commons.release.desc (optional) |
38+
| - commons.release.subdir (optional) |
39+
| - commons.release.hash (optional, lowercase, default sha512) |
40+
| |
41+
| - commons.release.[234].version (conditional) |
42+
| - commons.release.[234].name (conditional) |
43+
| - commons.release.[234].binary.suffix (optional) |
44+
| - commons.release.[234].desc (optional) |
45+
| - commons.release.[234].subdir (optional) |
46+
| - commons.release.[234].hash (optional, lowercase, [sha512])|
3647
| |
3748
| 3) Example Properties |
49+
| (commons.release.name inherited by parent: |
50+
| ${project.artifactId}-${commons.release.version} |
3851
| |
3952
| <properties> |
4053
| <commons.componentid>math</commons.componentid> |
@@ -46,17 +59,17 @@ limitations under the License.
4659
<document>
4760
<properties>
4861
<title>Download Apache Commons CLI</title>
49-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
62+
<author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
5063
</properties>
5164
<body>
5265
<section name="Download Apache Commons CLI">
5366
<subsection name="Using a Mirror">
5467
<p>
5568
We recommend you use a mirror to download our release
56-
builds, but you <strong>must</strong> verify the integrity of
69+
builds, but you <strong>must</strong> <a href="https://www.apache.org/info/verification.html">verify the integrity</a> of
5770
the downloaded files using signatures downloaded from our main
5871
distribution directories. Recent releases (48 hours) may not yet
59-
be available from the mirrors.
72+
be available from all the mirrors.
6073
</p>
6174

6275
<p>
@@ -88,39 +101,44 @@ limitations under the License.
88101
</form>
89102

90103
<p>
91-
The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
92-
link links to the code signing keys used to sign the product.
93-
The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
94-
The <code>MD5</code> link downloads the checksum from the main site.
104+
It is essential that you
105+
<a href="https://www.apache.org/info/verification.html">verify the integrity</a>
106+
of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
107+
failing that using the <code>SHA512</code> hash (<code>*.sha512</code> checksum files).
108+
</p>
109+
<p>
110+
The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
111+
file contains the public PGP keys used by Apache Commons developers
112+
to sign releases.
95113
</p>
96114
</subsection>
97115
</section>
98-
<section name="Apache Commons CLI 1.4 ">
116+
<section name="Apache Commons CLI 1.5 ">
99117
<subsection name="Binaries">
100118
<table>
101119
<tr>
102-
<td><a href="[preferred]/commons/cli/binaries/commons-cli-1.4-bin.tar.gz">commons-cli-1.4-bin.tar.gz</a></td>
103-
<td><a href="http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.4-bin.tar.gz.md5">md5</a></td>
104-
<td><a href="http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.4-bin.tar.gz.asc">pgp</a></td>
120+
<td><a href="[preferred]/commons/cli/binaries/commons-cli-1.5-bin.tar.gz">commons-cli-1.5-bin.tar.gz</a></td>
121+
<td><a href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5-bin.tar.gz.sha512">sha512</a></td>
122+
<td><a href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5-bin.tar.gz.asc">pgp</a></td>
105123
</tr>
106124
<tr>
107-
<td><a href="[preferred]/commons/cli/binaries/commons-cli-1.4-bin.zip">commons-cli-1.4-bin.zip</a></td>
108-
<td><a href="http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.4-bin.zip.md5">md5</a></td>
109-
<td><a href="http://www.apache.org/dist/commons/cli/binaries/commons-cli-1.4-bin.zip.asc">pgp</a></td>
125+
<td><a href="[preferred]/commons/cli/binaries/commons-cli-1.5-bin.zip">commons-cli-1.5-bin.zip</a></td>
126+
<td><a href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5-bin.zip.sha512">sha512</a></td>
127+
<td><a href="https://www.apache.org/dist/commons/cli/binaries/commons-cli-1.5-bin.zip.asc">pgp</a></td>
110128
</tr>
111129
</table>
112130
</subsection>
113131
<subsection name="Source">
114132
<table>
115133
<tr>
116-
<td><a href="[preferred]/commons/cli/source/commons-cli-1.4-src.tar.gz">commons-cli-1.4-src.tar.gz</a></td>
117-
<td><a href="http://www.apache.org/dist/commons/cli/source/commons-cli-1.4-src.tar.gz.md5">md5</a></td>
118-
<td><a href="http://www.apache.org/dist/commons/cli/source/commons-cli-1.4-src.tar.gz.asc">pgp</a></td>
134+
<td><a href="[preferred]/commons/cli/source/commons-cli-1.5-src.tar.gz">commons-cli-1.5-src.tar.gz</a></td>
135+
<td><a href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5-src.tar.gz.sha512">sha512</a></td>
136+
<td><a href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5-src.tar.gz.asc">pgp</a></td>
119137
</tr>
120138
<tr>
121-
<td><a href="[preferred]/commons/cli/source/commons-cli-1.4-src.zip">commons-cli-1.4-src.zip</a></td>
122-
<td><a href="http://www.apache.org/dist/commons/cli/source/commons-cli-1.4-src.zip.md5">md5</a></td>
123-
<td><a href="http://www.apache.org/dist/commons/cli/source/commons-cli-1.4-src.zip.asc">pgp</a></td>
139+
<td><a href="[preferred]/commons/cli/source/commons-cli-1.5-src.zip">commons-cli-1.5-src.zip</a></td>
140+
<td><a href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5-src.zip.sha512">sha512</a></td>
141+
<td><a href="https://www.apache.org/dist/commons/cli/source/commons-cli-1.5-src.zip.asc">pgp</a></td>
124142
</tr>
125143
</table>
126144
</subsection>

src/site/xdoc/issue-tracking.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ limitations under the License.
2626
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
2727
+======================================================================+
2828
| |
29-
| 1) Re-generate using: mvn commons:jira-page |
29+
| 1) Re-generate using: mvn commons-build:jira-page |
3030
| |
3131
| 2) Set the following properties in the component's pom: |
3232
| - commons.jira.id (required, alphabetic, upper case) |
@@ -43,15 +43,15 @@ limitations under the License.
4343
-->
4444
<document>
4545
<properties>
46-
<title>Commons CLI Issue tracking</title>
47-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
46+
<title>Apache Commons CLI Issue tracking</title>
47+
<author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
4848
</properties>
4949
<body>
5050

51-
<section name="Commons CLI Issue tracking">
51+
<section name="Apache Commons CLI Issue tracking">
5252
<p>
53-
Commons CLI uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
54-
See the <a href="https://issues.apache.org/jira/browse/CLI">Commons CLI JIRA project page</a>.
53+
Apache Commons CLI uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
54+
See the <a href="https://issues.apache.org/jira/browse/CLI">Apache Commons CLI JIRA project page</a>.
5555
</p>
5656

5757
<p>
@@ -63,7 +63,7 @@ limitations under the License.
6363

6464
<p>
6565
If you would like to report a bug, or raise an enhancement request with
66-
Commons CLI please do the following:
66+
Apache Commons CLI please do the following:
6767
<ol>
6868
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
6969
If you find your issue listed then please add a comment with your details.</li>
@@ -80,21 +80,21 @@ limitations under the License.
8080
<ul>
8181
<li>the more information you provide, the better we can help you</li>
8282
<li>test cases are vital, particularly for any proposed enhancements</li>
83-
<li>the developers of Commons CLI are all unpaid volunteers</li>
83+
<li>the developers of Apache Commons CLI are all unpaid volunteers</li>
8484
</ul>
8585
</p>
8686

8787
<p>
8888
For more information on subversion and creating patches see the
89-
<a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>.
89+
<a href="https://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>.
9090
</p>
9191

9292
<p>
9393
You may also find these links useful:
9494
<ul>
95-
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Commons CLI bugs</a></li>
96-
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Commons CLI bugs</a></li>
97-
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Commons CLI bugs</a></li>
95+
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons CLI bugs</a></li>
96+
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons CLI bugs</a></li>
97+
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons CLI bugs</a></li>
9898
</ul>
9999
</p>
100100
</section>

0 commit comments

Comments
 (0)