From 0c63e18b8a5e5b9b0195a632d136c85c1452b34f Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Jul 2024 16:13:10 +0000 Subject: [PATCH] Prepare for the next release candidate --- CONTRIBUTING.md | 9 ++++----- README.md | 10 ++++++---- RELEASE-NOTES.txt | 34 ++++++++++++++++++++++++++++++++ src/changes/changes.xml | 2 +- src/site/xdoc/download_codec.xml | 26 ++++++++++++------------ 5 files changed, 58 insertions(+), 23 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 62e99f8d28..d4e74f7481 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,9 +41,8 @@ Contributing to Apache Commons Codec ====================== -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 -the open source community. Before you dig right into the code there are a few guidelines that we need contributors to -follow so that we can have a chance of keeping on top of things. +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. +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. Getting Started --------------- @@ -62,7 +61,7 @@ Making Changes + Create a _topic branch_ for your isolated work. * Usually you should base your branch on the `master` branch. - * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `CODEC-123-InputStream`. + * A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `CODEC-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. @@ -72,7 +71,7 @@ Making Changes + 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. + Check for unnecessary whitespace with `git diff` -- check before committing. + Make sure you have added the necessary tests for your changes, typically in `src/test/java`. -+ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken. ++ Run all the tests with `mvn clean verify` to ensure nothing else was accidentally broken. Making Trivial Changes ---------------------- diff --git a/README.md b/README.md index 21e88e3d2f..d5750ab84e 100644 --- a/README.md +++ b/README.md @@ -45,11 +45,11 @@ Apache Commons Codec [![Java CI](https://github.com/apache/commons-codec/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-codec/actions/workflows/maven.yml) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-codec/commons-codec/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-codec/commons-codec/?gav=true) -[![Javadocs](https://javadoc.io/badge/commons-codec/commons-codec/1.17.0.svg)](https://javadoc.io/doc/commons-codec/commons-codec/1.17.0) +[![Javadocs](https://javadoc.io/badge/commons-codec/commons-codec/1.17.1.svg)](https://javadoc.io/doc/commons-codec/commons-codec/1.17.1) [![CodeQL](https://github.com/apache/commons-codec/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-codec/actions/workflows/codeql-analysis.yml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-codec/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-codec) -The Apache Commons Codec component contains encoder and decoders for +The Apache Commons Codec component contains encoders and decoders for various formats such as Base16, Base32, Base64, digest, and Hexadecimal. In addition to these widely used encoders and decoders, the codec package also maintains a collection of phonetic encoding utilities. @@ -71,7 +71,7 @@ Alternatively, you can pull it from the central Maven repositories: commons-codec commons-codec - 1.17.0 + 1.17.1 ``` @@ -91,7 +91,9 @@ There are some guidelines which will make applying PRs easier for us: + No tabs! Please use spaces for indentation. + Respect the existing code style for each file. + 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. -+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```. ++ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running `mvn`. ++ Before you pushing a PR, run `mvn` (by itself), this runs the default goal, which contains all build checks. ++ To see the code coverage report, regardless of coverage failures, run `mvn clean site -Dcommons.jacoco.haltOnFailure=false` If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas). You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md). diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 920aa6171a..57ee97eb43 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,37 @@ +Apache Commons Codec 1.17.1 RELEASE NOTES +----------------------------------------- + +The Apache Commons Codec component contains encoders and decoders for +various formats such as Base16, Base32, Base64, digest, and Hexadecimal. In addition to these +widely used encoders and decoders, the codec package also maintains a +collection of phonetic encoding utilities. + +Feature and fix release. Requires a minimum of Java 8. + + + +Fixed Bugs +---------- + +* Md5Crypt now throws IllegalArgumentException on an invalid prefix. Thanks to Gary Gregory. + +Changes +------- + +* Bump org.apache.commons:commons-parent from 69 to 71 #286. Thanks to Gary Gregory. +* Bump org.codehaus.mojo:animal-sniffer-maven-plugin from 1.23 to 1.24 #293. Thanks to Dependabot. +* Bump org.codehaus.mojo:taglist-maven-plugin from 3.0.0 to 3.1.0 #292. Thanks to Dependabot. + + +For complete information on Apache Commons Codec, including instructions on how to submit bug reports, +patches, or suggestions for improvement, see the Apache Commons Codec website: + +https://commons.apache.org/proper/commons-codec/ + +Download page: https://commons.apache.org/proper/commons-codec/download_codec.cgi + +--------------------------------------------------------------------------------- + Apache Commons Codec 1.17.0 RELEASE NOTES ----------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index cec1232621..8c2a9ed10a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,7 +43,7 @@ The type attribute can be add,update,fix,remove. Apache Commons Developers - + Md5Crypt now throws IllegalArgumentException on an invalid prefix. diff --git a/src/site/xdoc/download_codec.xml b/src/site/xdoc/download_codec.xml index 21317e594b..ad48414247 100644 --- a/src/site/xdoc/download_codec.xml +++ b/src/site/xdoc/download_codec.xml @@ -113,32 +113,32 @@ limitations under the License.

-
+
- - - + + + - - - + + +
commons-codec-1.17.0-bin.tar.gzsha512pgpcommons-codec-1.17.1-bin.tar.gzsha512pgp
commons-codec-1.17.0-bin.zipsha512pgpcommons-codec-1.17.1-bin.zipsha512pgp
- - - + + + - - - + + +
commons-codec-1.17.0-src.tar.gzsha512pgpcommons-codec-1.17.1-src.tar.gzsha512pgp
commons-codec-1.17.0-src.zipsha512pgpcommons-codec-1.17.1-src.zipsha512pgp