Skip to content

Commit 78fc6c7

Browse files
committed
Update auto generated files
1 parent 84a5fcf commit 78fc6c7

3 files changed

Lines changed: 57 additions & 35 deletions

File tree

CONTRIBUTING.md

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -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 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 IO'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. `IO-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. `IO-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 IO JIRA project page](https://issues.apache.org/jira/browse/IO)
107+
+ [Apache Commons IO JIRA project page][jira]
91108
+ [Contributor License Agreement][cla]
92109
+ [General GitHub documentation](https://help.github.com/)
93110
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
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/IO

README.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,17 @@ Apache Commons IO
4444
===================
4545

4646
[![Build Status](https://travis-ci.org/apache/commons-io.svg?branch=master)](https://travis-ci.org/apache/commons-io)
47-
[![Coverage Status](https://coveralls.io/repos/github/apache/commons-io/badge.svg?branch=master)](https://coveralls.io/github/apache/commons-io?branch=master)
47+
[![Coverage Status](https://coveralls.io/repos/apache/commons-io/badge.svg?branch=master)](https://coveralls.io/r/apache/commons-io)
48+
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-io/commons-io/badge.svg)](https://maven-badges.herokuapp.com/maven-central/commons-io/commons-io/)
49+
[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
4850

49-
The Apache Commons IO library contains utility classes, stream implementations, file filters,
51+
The Apache Commons IO library contains utility classes, stream implementations, file filters,
5052
file comparators, endian transformation classes, and much more.
5153

5254
Documentation
5355
-------------
5456

55-
More information can be found on the [homepage](https://commons.apache.org/proper/commons-io).
57+
More information can be found on the [Apache Commons IO homepage](https://commons.apache.org/proper/commons-io).
5658
The [JavaDoc](https://commons.apache.org/proper/commons-io/javadocs/api-release) can be browsed.
5759
Questions related to the usage of Apache Commons IO should be posted to the [user mailing list][ml].
5860

@@ -66,14 +68,14 @@ Alternatively you can pull it from the central Maven repositories:
6668
<dependency>
6769
<groupId>commons-io</groupId>
6870
<artifactId>commons-io</artifactId>
69-
<version>2.5</version>
71+
<version>2.6</version>
7072
</dependency>
7173
```
7274

7375
Contributing
7476
------------
7577

76-
We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
78+
We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors.
7779
There are some guidelines which will make applying PRs easier for us:
7880
+ No tabs! Please use spaces for indentation.
7981
+ Respect the code style.
@@ -85,7 +87,9 @@ You can learn more about contributing via GitHub in our [contribution guidelines
8587

8688
License
8789
-------
88-
Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
90+
This code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0).
91+
92+
See the `NOTICE.txt` file for required notices and attributions.
8993

9094
Donations
9195
---------
@@ -94,9 +98,9 @@ You like Apache Commons IO? Then [donate back to the ASF](https://www.apache.org
9498
Additional Resources
9599
--------------------
96100

97-
+ [Apache Commons IO Homepage](https://commons.apache.org/proper/commons-io/)
98-
+ [Apache Commons IO Bugtracker (JIRA)](https://issues.apache.org/jira/browse/IO)
101+
+ [Apache Commons Homepage](https://commons.apache.org/)
102+
+ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/IO)
99103
+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
100-
+ #apachecommons IRC channel on freenode.org
104+
+ `#apache-commons` IRC channel on `irc.freenode.org`
101105

102106
[ml]:https://commons.apache.org/mail-lists.html

src/site/xdoc/issue-tracking.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,35 @@ limitations under the License.
4343
-->
4444
<document>
4545
<properties>
46-
<title>Commons IO Issue tracking</title>
47-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
46+
<title>Apache Commons IO Issue tracking</title>
47+
<author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
4848
</properties>
4949
<body>
5050

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

5757
<p>
58-
To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
58+
To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
5959
(if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
60-
created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
60+
created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
6161
page to get a new password).
6262
</p>
6363

6464
<p>
6565
If you would like to report a bug, or raise an enhancement request with
66-
Commons IO please do the following:
66+
Apache Commons IO please do the following:
6767
<ol>
68-
<li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310477&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
68+
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310477&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>
7070
<li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
7171
You may find your issue or idea has already been discussed.</li>
7272
<li>Decide if your issue is a bug or an enhancement.</li>
73-
<li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
74-
or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
73+
<li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
74+
or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310477&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
7575
</ol>
7676
</p>
7777

@@ -80,7 +80,7 @@ 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 IO are all unpaid volunteers</li>
83+
<li>the developers of Apache Commons IO are all unpaid volunteers</li>
8484
</ul>
8585
</p>
8686

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

0 commit comments

Comments
 (0)