Skip to content

Commit e72713f

Browse files
committed
Prepare for the next release candidate
1 parent 15c7b2d commit e72713f

File tree

10 files changed

+210
-88
lines changed

10 files changed

+210
-88
lines changed

CONTRIBUTING.md

Lines changed: 35 additions & 19 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) |
@@ -41,57 +41,73 @@
4141
Contributing to Apache Commons BeanUtils
4242
======================
4343

44-
You have found a bug or you have an idea for a cool new feature? Contributing code is a great way to give something back to
45-
the open source community. Before you dig right into the code there are a few guidelines that we need contributors to
46-
follow so that we can have a chance of keeping on top of things.
44+
Have you found a bug or have an idea for a cool new feature? Contributing code is a great way to give something back to the open-source community.
45+
Before you dig right into the code, we need contributors to follow a few guidelines to have a chance of keeping on top of things.
4746

4847
Getting Started
4948
---------------
5049

5150
+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
52-
+ Make sure you have a [GitHub account](https://github.com/signup/free).
53-
+ 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 BeanUtils's scope.
54-
+ Submit a ticket for your issue, assuming one does not already exist.
51+
+ Make sure you have a [GitHub account](https://github.com/signup/free). This is not essential, but makes providing patches much easier.
52+
+ 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 BeanUtils's scope.
53+
+ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
5554
+ Clearly describe the issue including steps to reproduce when it is a bug.
5655
+ Make sure you fill in the earliest version that you know has the issue.
57-
+ Fork the repository on GitHub.
56+
+ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
57+
[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository. If you don't have a GitHub account, you can still clone the Commons repository.
5858

5959
Making Changes
6060
--------------
6161

62-
+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
62+
+ Create a _topic branch_ for your isolated work.
63+
* Usually you should base your branch on the `master` branch.
64+
* A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `BEANUTILS-123-InputStream`.
65+
* If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
6366
+ Make commits of logical units.
67+
* Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
68+
* e.g. `BEANUTILS-123: Close input stream earlier`
6469
+ Respect the original code style:
6570
+ 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.
70-
+ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
71+
+ 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.
72+
+ Check for unnecessary whitespace with `git diff` -- check before committing.
73+
+ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
74+
+ Run all the tests with `mvn clean verify` to ensure nothing else was accidentally broken.
7175

7276
Making Trivial Changes
7377
----------------------
7478

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

84+
7885
Submitting Changes
7986
------------------
8087

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

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

89105
+ [Contributing patches](https://commons.apache.org/patches.html)
90-
+ [Apache Commons BeanUtils JIRA project page](https://issues.apache.org/jira/browse/BEANUTILS)
106+
+ [Apache Commons BeanUtils JIRA project page][jira]
91107
+ [Contributor License Agreement][cla]
92108
+ [General GitHub documentation](https://help.github.com/)
93-
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
109+
+ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
94110
+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
95-
+ #apachecommons IRC channel on freenode.org
96111

97112
[cla]:https://www.apache.org/licenses/#clas
113+
[jira]:https://issues.apache.org/jira/browse/BEANUTILS

NOTICE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Commons BeanUtils
2-
Copyright 2000-2019 The Apache Software Foundation
2+
Copyright 2000-2024 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: 39 additions & 18 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,56 +43,77 @@
4343
Apache Commons BeanUtils
4444
===================
4545

46+
[![Java CI](https://github.com/apache/commons-beanutils/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-beanutils/actions/workflows/maven.yml)
47+
[![Maven Central](https://img.shields.io/maven-central/v/commons-beanutils/commons-beanutils?label=Maven%20Central)](https://search.maven.org/artifact/commons-beanutils/commons-beanutils)
48+
[![Javadocs](https://javadoc.io/badge/commons-beanutils/commons-beanutils/1.10.0.svg)](https://javadoc.io/doc/commons-beanutils/commons-beanutils/1.10.0)
49+
[![CodeQL](https://github.com/apache/commons-beanutils/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-beanutils/actions/workflows/codeql-analysis.yml)
50+
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-beanutils/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-beanutils)
51+
4652
Apache Commons BeanUtils provides an easy-to-use but flexible wrapper around reflection and introspection.
4753

4854
Documentation
4955
-------------
5056

51-
More information can be found on the [homepage](https://commons.apache.org/proper/commons-beanutils).
52-
The [JavaDoc](https://commons.apache.org/proper/commons-beanutils/javadocs/api-release) can be browsed.
53-
Questions related to the usage of Apache Commons BeanUtils should be posted to the [user mailing list][ml].
57+
More information can be found on the [Apache Commons BeanUtils homepage](https://commons.apache.org/proper/commons-beanutils).
58+
The [Javadoc](https://commons.apache.org/proper/commons-beanutils/apidocs) can be browsed.
59+
Questions related to the usage of Apache Commons BeanUtils should be posted to the [user mailing list](https://commons.apache.org/mail-lists.html).
5460

55-
Where can I get the latest release?
56-
-----------------------------------
61+
Getting the latest release
62+
--------------------------
5763
You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-beanutils/download_beanutils.cgi).
5864

59-
Alternatively you can pull it from the central Maven repositories:
65+
Alternatively, you can pull it from the central Maven repositories:
6066

6167
```xml
6268
<dependency>
6369
<groupId>commons-beanutils</groupId>
6470
<artifactId>commons-beanutils</artifactId>
65-
<version>1.9.3</version>
71+
<version>1.10.0</version>
6672
</dependency>
6773
```
6874

75+
Building
76+
--------
77+
78+
Building requires a Java JDK and [Apache Maven](https://maven.apache.org/).
79+
The required Java version is found in the `pom.xml` as the `maven.compiler.source` property.
80+
81+
From a command shell, run `mvn` without arguments to invoke the default Maven goal to run all tests and checks.
82+
6983
Contributing
7084
------------
7185

72-
We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
86+
We accept Pull Requests via GitHub. The [developer mailing list](https://commons.apache.org/mail-lists.html) is the main channel of communication for contributors.
7387
There are some guidelines which will make applying PRs easier for us:
7488
+ No tabs! Please use spaces for indentation.
75-
+ Respect the code style.
89+
+ Respect the existing code style for each file.
7690
+ 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.
77-
+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn clean test```.
91+
+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running `mvn`.
92+
+ Before you pushing a PR, run `mvn` (by itself), this runs the default goal, which contains all build checks.
93+
+ To see the code coverage report, regardless of coverage failures, run `mvn clean site -Dcommons.jacoco.haltOnFailure=false`
7894

7995
If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas).
8096
You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md).
8197

8298
License
8399
-------
84-
Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
100+
This code is licensed under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0).
101+
102+
See the `NOTICE.txt` file for required notices and attributions.
85103

86-
Donations
87-
---------
88-
You like Apache Commons BeanUtils? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development.
104+
Donating
105+
--------
106+
You like Apache Commons BeanUtils? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support development.
89107

90108
Additional Resources
91109
--------------------
92110

93111
+ [Apache Commons Homepage](https://commons.apache.org/)
94-
+ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/)
112+
+ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/BEANUTILS)
113+
+ [Apache Commons Slack Channel](https://the-asf.slack.com/archives/C60NVB8AD)
95114
+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
96-
+ #apachecommons IRC channel on freenode.org
97115

98-
[ml]:https://commons.apache.org/mail-lists.html
116+
Apache Commons Components
117+
-------------------------
118+
119+
Please see the [list of components](https://commons.apache.org/components.html)

RELEASE-NOTES.txt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,59 @@
1+
Apache Commons BeanUtils 1.10.0
2+
RELEASE NOTES
3+
4+
The Apache Commons BeanUtils team is pleased to announce the release of Apache Commons BeanUtils 1.10.0
5+
6+
Apache Commons BeanUtils provides an easy-to-use but flexible wrapper around reflection and introspection.
7+
8+
This is a maintenance release, requires Java 8.
9+
10+
Changes in this version include:
11+
12+
Fixed Bugs:
13+
o BEANUTILS-541: FluentPropertyBeanIntrospector caches corrupted writeMethod (1.x backport) #69. Thanks to Sergey Chernov.
14+
o Replace internal use of Locale.ENGLISH with Locale.ROOT. Thanks to Gary Gregory.
15+
o Replace Maven CLIRR plugin with JApiCmp. Thanks to Gary Gregory.
16+
o Port to Java 1.4 Throwable APIs (!). Thanks to Gary Gregory.
17+
o Fix Javadoc generation on Java 8, 17, and 21. Thanks to Gary Gregory.
18+
o AbstractArrayConverter.parseElements(String) now returns a List<String> instead of a raw List. Thanks to Gary Gregory.
19+
20+
Changes:
21+
o Bump org.apache.commons:commons-parent from 47 to 78. Thanks to Gary Gregory.
22+
o Bump Java requirement from Java 6 to 8. Thanks to Gary Gregory.
23+
o Bump junit:junit from 4.12 to 4.13.2. Thanks to Gary Gregory.
24+
o Bump JUnit from 4.x to 5.x "vintage". Thanks to Gary Gregory.
25+
o Bump commons-logging:commons-logging from 1.2 to 1.3.4. Thanks to Gary Gregory.
26+
o Deprecate BeanUtilsBean.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable). Thanks to Gary Gregory.
27+
o Deprecate BeanUtils.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable). Thanks to Gary Gregory.
28+
29+
30+
Historical list of changes: https://commons.apache.org/proper/commons-beanutils//changes-report.html
31+
32+
For complete information on Apache Commons BeanUtils, including instructions on how to submit bug reports,
33+
patches, or suggestions for improvement, see the Apache Commons BeanUtils website:
34+
35+
https://commons.apache.org/proper/commons-beanutils/
36+
37+
Download it from https://commons.apache.org/proper/commons-beanutils/download_bcel.cgi
38+
39+
Have fun!
40+
-Apache Commons BCEL team
41+
42+
Feedback
43+
--------
44+
Open source works best when you give feedback:
45+
46+
https://commons.apache.org/beanutils
47+
48+
Please direct all bug reports to JIRA:
49+
50+
https://issues.apache.org/jira/browse/BEANUTILS
51+
52+
Or subscribe to the commons-user mailing list
53+
54+
The Apache Commons Team
55+
56+
-----------------------------------------------------------------------------
157
Apache Commons BeanUtils 1.9.4
258
RELEASE NOTES
359

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929

3030
<inceptionYear>2000</inceptionYear>
3131
<description>Apache Commons BeanUtils provides an easy-to-use but flexible wrapper around reflection and introspection.</description>
32-
<url>https://commons.apache.org/proper/commons-beanutils/</url>
32+
<url>https://commons.apache.org/proper/commons-beanutils</url>
3333

3434
<properties>
3535
<maven.compiler.source>1.8</maven.compiler.source>
3636
<maven.compiler.target>1.8</maven.compiler.target>
3737
<commons.module.name>org.apache.commons.beanutils</commons.module.name>
3838
<commons.componentid>beanutils</commons.componentid>
3939
<commons.release.version>1.10.0</commons.release.version>
40+
<commons.release.next>1.10.1</commons.release.next>
4041
<commons.jira.id>BEANUTILS</commons.jira.id>
4142
<commons.jira.pid>12310460</commons.jira.pid>
4243
<!-- Limit memory size see BEANUTILS-291; allow command-line override -->

src/changes/changes.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<title>Release Notes</title>
2929
</properties>
3030
<body>
31-
<release version="1.10.0" date="YYYY-MM-DD" description="This is a maintenance release, requires Java 8.">
31+
<release version="1.10.0" date="2024-12-26" description="This is a maintenance release, requires Java 8.">
3232
<!-- FIX -->
3333
<action type="fix" issue="BEANUTILS-541" dev="ggregory" due-to="Sergey Chernov">FluentPropertyBeanIntrospector caches corrupted writeMethod (1.x backport) #69.</action>
3434
<action type="fix" dev="ggregory" due-to="Gary Gregory">Replace internal use of Locale.ENGLISH with Locale.ROOT.</action>
@@ -41,7 +41,6 @@
4141
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump Java requirement from Java 6 to 8.</action>
4242
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump junit:junit from 4.12 to 4.13.2.</action>
4343
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump JUnit from 4.x to 5.x "vintage".</action>
44-
4544
<action dev="ggregory" type="update" due-to="Gary Gregory">Bump commons-logging:commons-logging from 1.2 to 1.3.4.</action>
4645
<!-- REMOVE -->
4746
<action dev="ggregory" type="update" due-to="Gary Gregory">Deprecate BeanUtilsBean.initCause(Throwable, Throwable) for removal, use Throwable.initCause(Throwable).</action>

src/changes/release-notes.vm

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,30 @@ Removed:
114114
## End of main loop
115115
#end
116116

117-
Historical list of changes: ${project.url}changes-report.html
117+
Historical list of changes: ${project.url}/changes-report.html
118118

119119
For complete information on ${project.name}, including instructions on how to submit bug reports,
120-
patches, or suggestions for improvement, see the Apache ${project.name} website:
120+
patches, or suggestions for improvement, see the ${project.name} website:
121121

122122
${project.url}
123+
124+
Download it from ${project.url}/download_beanutils.cgi
125+
126+
Have fun!
127+
-Apache Commons BCEL team
128+
129+
Feedback
130+
--------
131+
Open source works best when you give feedback:
132+
133+
https://commons.apache.org/beanutils
134+
135+
Please direct all bug reports to JIRA:
136+
137+
https://issues.apache.org/jira/browse/BEANUTILS
138+
139+
Or subscribe to the commons-user mailing list
140+
141+
The Apache Commons Team
142+
143+
-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)