This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-text.git
The following commit(s) were added to refs/heads/master by this push: new a42fbcd2 Prepare for the next release candidate a42fbcd2 is described below commit a42fbcd21ddebbea253ff669f3af9fc8646337b6 Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Mon Apr 7 19:37:10 2025 +0000 Prepare for the next release candidate --- CONTRIBUTING.md | 6 ++--- README.md | 6 ++--- RELEASE-NOTES.txt | 57 ++++++++++++++++++++++++++++++++++++++++ pom.xml | 6 ++--- src/changes/changes.xml | 2 +- src/site/xdoc/download_text.xml | 36 +++++++++++++------------ src/site/xdoc/issue-tracking.xml | 14 +++++----- src/site/xdoc/mail-lists.xml | 14 +++++----- 8 files changed, 102 insertions(+), 39 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32f45c33..29041c11 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ (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 + https://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, @@ -61,11 +61,11 @@ Making Changes + Create a _topic branch_ for your isolated work. * Usually you should base your branch from the `master` branch. - * A good topic branch name can be the JIRA bug ID plus a keyword, for example, `TEXT-123-InputStream`. + * A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `TEXT-123-InputStream`. * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests. + Make commits of logical units. * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue. - * For example, `[TEXT-123] Close input stream earlier` + * For example, `[TEXT-123] Close input stream sooner` + Respect the original code style: + Only use spaces for indentation; you can check for unnecessary whitespace with `git diff` before committing. + 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. diff --git a/README.md b/README.md index 3110a067..7487c1f2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ (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 + https://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, @@ -45,7 +45,7 @@ Apache Commons Text [](https://github.com/apache/commons-text/actions/workflows/maven.yml) [](https://search.maven.org/artifact/org.apache.commons/commons-text) -[](https://javadoc.io/doc/org.apache.commons/commons-text/1.13.0) +[](https://javadoc.io/doc/org.apache.commons/commons-text/1.13.1) [](https://github.com/apache/commons-text/actions/workflows/codeql-analysis.yml) [](https://api.securityscorecards.dev/projects/github.com/apache/commons-text) @@ -69,7 +69,7 @@ Alternatively, you can pull it from the central Maven repositories: <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.13.0</version> + <version>1.13.1</version> </dependency> ``` diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 49fe0d92..9013bd52 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,6 +15,63 @@ See the License for the specific language governing permissions and limitations under the License. +Apache Commons Text 1.13.1 Release Notes +---------------------------------------- + +This document contains the release notes for the 1.13.1 version of Apache Commons Text. + +Apache Commons Text is a set of utility functions and reusable components for the purpose of processing +and manipulating text that should be of use in a Java environment. + +Release 1.13.1. Requires Java 8 or above. + + + +Fixed Bugs +---------- + +* Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80). Thanks to Gary Gregory. +* Deprecate EntityArrays.EntityArrays(). Thanks to Gary Gregory. +* StringLookupFactory.DefaultStringLookupsHolder.createDefaultStringLookups() maps DefaultStringLookup.LOCAL_HOST twice instead of once for LOCAL_HOST and LOOPBACK_ADDRESS. Thanks to Gary Gregory. + +Changes +------- + +* Bump org.apache.commons:commons-parent from 79 to 81. Thanks to Gary Gregory. +* Bump commons.bytebuddy.version from 1.16.1 to 1.17.5 #643, #659, #660. Thanks to Gary Gregory, Dependabot. +* Bump graalvm.version from 24.1.2 to 24.2.0 #653. Thanks to Gary Gregory, Dependabot. + + +Historical list of changes: https://commons.apache.org/proper/commons-text/changes.html + +For complete information on Apache Commons Text, including instructions on how to submit bug reports, +patches, or suggestions for improvement, see the Apache Commons Text website: + +https://commons.apache.org/proper/commons-text + +Download page: https://commons.apache.org/proper/commons-text/download_text.cgi + +Have fun! +-Apache Commons Team + +----------------------------------------------------------------------------- + +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. + + Apache Commons Text Version 1.13.0 Release Notes ------------------------------------------------ diff --git a/pom.xml b/pom.xml index 28526106..33b348b3 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ <commons.packageId>text</commons.packageId> <commons.module.name>org.apache.commons.text</commons.module.name> - <commons.release.version>1.13.0</commons.release.version> - <commons.release.next>1.13.1</commons.release.next> + <commons.release.version>1.13.1</commons.release.version> + <commons.release.next>1.13.2</commons.release.next> <commons.release.desc>(Java 8+)</commons.release.desc> <commons.jira.id>TEXT</commons.jira.id> @@ -68,7 +68,7 @@ <!-- Commons Release Plugin --> <!-- Previous version of the component (used for reporting binary compatibility check)--> - <commons.bc.version>1.12.0</commons.bc.version> + <commons.bc.version>1.13.0</commons.bc.version> <commons.rc.version>RC1</commons.rc.version> <commons.release.isDistModule>true</commons.release.isDistModule> <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index fd611bc8..c58292cc 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,7 +45,7 @@ The <action> type attribute can be add,update,fix,remove. <title>Apache Commons Text Changes</title> </properties> <body> - <release version="1.13.1" date="YYYY-MM-DD" description="Release 1.13.1. Requires Java 8 or above."> + <release version="1.13.1" date="2025-04-07" description="Release 1.13.1. Requires Java 8 or above."> <!-- FIX --> <action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action> <action type="fix" dev="ggregory" due-to="Gary Gregory">Deprecate EntityArrays.EntityArrays().</action> diff --git a/src/site/xdoc/download_text.xml b/src/site/xdoc/download_text.xml index e2ce66c9..c16a6f02 100644 --- a/src/site/xdoc/download_text.xml +++ b/src/site/xdoc/download_text.xml @@ -7,7 +7,7 @@ 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 + https://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, @@ -56,10 +56,12 @@ limitations under the License. | | +======================================================================+ --> -<document> +<document xmlns="http://maven.apache.org/XDOC/2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> <properties> <title>Download Apache Commons Text</title> - <author email="d...@commons.apache.org">Apache Commons Documentation Team</author> + <author email="d...@commons.apache.org">Apache Commons Team</author> </properties> <body> <section name="Download Apache Commons Text"> @@ -79,7 +81,7 @@ limitations under the License. mirrors (at the end of the mirrors list) that should be available. <br></br> - [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end] + [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0" alt="Logo"></img></a>[end] </p> <form action="[location]" method="get" id="SelectMirror"> @@ -113,32 +115,32 @@ limitations under the License. </p> </subsection> </section> - <section name="Apache Commons Text 1.13.0 (Java 8+)"> + <section name="Apache Commons Text 1.13.1 (Java 8+)"> <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/text/binaries/commons-text-1.13.0-bin.tar.gz">commons-text-1.13.0-bin.tar.gz</a></td> - <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.0-bin.tar.gz.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.0-bin.tar.gz.asc">pgp</a></td> + <td><a href="[preferred]/commons/text/binaries/commons-text-1.13.1-bin.tar.gz">commons-text-1.13.1-bin.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.1-bin.tar.gz.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.1-bin.tar.gz.asc">pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/text/binaries/commons-text-1.13.0-bin.zip">commons-text-1.13.0-bin.zip</a></td> - <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.0-bin.zip.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.0-bin.zip.asc">pgp</a></td> + <td><a href="[preferred]/commons/text/binaries/commons-text-1.13.1-bin.zip">commons-text-1.13.1-bin.zip</a></td> + <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.1-bin.zip.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/text/binaries/commons-text-1.13.1-bin.zip.asc">pgp</a></td> </tr> </table> </subsection> <subsection name="Source"> <table> <tr> - <td><a href="[preferred]/commons/text/source/commons-text-1.13.0-src.tar.gz">commons-text-1.13.0-src.tar.gz</a></td> - <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.0-src.tar.gz.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.0-src.tar.gz.asc">pgp</a></td> + <td><a href="[preferred]/commons/text/source/commons-text-1.13.1-src.tar.gz">commons-text-1.13.1-src.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.1-src.tar.gz.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.1-src.tar.gz.asc">pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/text/source/commons-text-1.13.0-src.zip">commons-text-1.13.0-src.zip</a></td> - <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.0-src.zip.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.0-src.zip.asc">pgp</a></td> + <td><a href="[preferred]/commons/text/source/commons-text-1.13.1-src.zip">commons-text-1.13.1-src.zip</a></td> + <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.1-src.zip.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/text/source/commons-text-1.13.1-src.zip.asc">pgp</a></td> </tr> </table> </subsection> diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index 49f6dffc..83219a0d 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -7,7 +7,7 @@ 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 + https://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, @@ -41,10 +41,12 @@ limitations under the License. | | +======================================================================+ --> -<document> +<document xmlns="http://maven.apache.org/XDOC/2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> <properties> <title>Apache Commons Text Issue tracking</title> - <author email="d...@commons.apache.org">Apache Commons Documentation Team</author> + <author email="d...@commons.apache.org">Apache Commons Team</author> </properties> <body> @@ -64,6 +66,7 @@ limitations under the License. <p> If you would like to report a bug, or raise an enhancement request with Apache Commons Text please do the following: + </p> <ol> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12318221&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> @@ -73,16 +76,15 @@ limitations under the License. <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318221&issuetype=1&priority=4&assignee=-1">bug report</a> or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12318221&issuetype=4&priority=4&assignee=-1">enhancement request</a>.</li> </ol> - </p> <p> Please also remember these points: + </p> <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 Apache Commons Text are all unpaid volunteers</li> </ul> - </p> <p> For more information on creating patches see the @@ -91,12 +93,12 @@ limitations under the License. <p> You may also find these links useful: + </p> <ul> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12318221&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Apache Commons Text bugs</a></li> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12318221&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Apache Commons Text bugs</a></li> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12318221&sorter/field=issuekey&sorter/order=DESC">All Apache Commons Text bugs</a></li> </ul> - </p> </section> </body> </document> diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index 40515172..806e21bb 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -7,7 +7,7 @@ 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 + https://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, @@ -39,10 +39,12 @@ limitations under the License. | | +======================================================================+ --> -<document> +<document xmlns="http://maven.apache.org/XDOC/2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd"> <properties> <title>Apache Commons Text Mailing Lists</title> - <author email="d...@commons.apache.org">Apache Commons Documentation Team</author> + <author email="d...@commons.apache.org">Apache Commons Team</author> </properties> <body> @@ -53,10 +55,10 @@ limitations under the License. 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>[text] Problem with the ...</li> - </ul> </p> + <ul> + <li>[text] Problem with the ...</li> + </ul> <p> Questions related to the usage of Apache Commons Text should be posted to the <a href="https://lists.apache.org/list.html?u...@commons.apache.org">User List</a>.