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-jexl.git
commit 08b4a401174423536ac4aa422833d85194202cfc Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Fri Apr 11 22:33:54 2025 +0000 Prepare for the next release candidate --- CONTRIBUTING.md | 19 +++++++------ README.md | 14 ++++++---- RELEASE-NOTES.txt | 59 ++++++++++++++++++++++++++++++++++++++++ pom.xml | 6 ++-- src/changes/changes.xml | 2 +- src/site/xdoc/download_jexl.xml | 36 ++++++++++++------------ src/site/xdoc/issue-tracking.xml | 14 ++++++---- src/site/xdoc/mail-lists.xml | 14 ++++++---- 8 files changed, 117 insertions(+), 47 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 868d672a..8a3d257d 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, @@ -41,9 +41,8 @@ Contributing to Apache Commons JEXL ====================== -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,16 +61,20 @@ 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, `JEXL-123-InputStream`. + * A good topic branch name can be the JIRA bug ID plus a keyword, e.g. `JEXL-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, `[JEXL-123] Close input stream earlier` + * For example, `[JEXL-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. -+ 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. ++ Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible but is a best-practice. +Unit tests are typically in the `src/test/java` directory. ++ Run a successful build using the default [Maven](https://maven.apache.org/) goal with `mvn`; that's `mvn` on the command line by itself. ++ Write a pull request description that is detailed enough to understand what the pull request does, how, and why. ++ Each commit in the pull request should have a meaningful subject line and body. Note that commits might be squashed by a maintainer on merge. + Making Trivial Changes ---------------------- diff --git a/README.md b/README.md index a28ab2d2..fe22efef 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,11 +45,11 @@ Apache Commons JEXL [](https://github.com/apache/commons-jexl/actions/workflows/maven.yml) [](https://search.maven.org/artifact/org.apache.commons/commons-jexl3) -[](https://javadoc.io/doc/org.apache.commons/commons-jexl3/3.4.0) +[](https://javadoc.io/doc/org.apache.commons/commons-jexl3/3.5.0) [](https://github.com/apache/commons-jexl/actions/workflows/codeql-analysis.yml) [](https://api.securityscorecards.dev/projects/github.com/apache/commons-jexl) -Apache Commons JEXL is a library facilitates the implementation of scripting features in +Apache Commons JEXL is a library that facilitates the implementation of scripting features in applications and frameworks written in Java. Documentation @@ -63,13 +63,13 @@ Getting the latest release -------------------------- You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-jexl/download_jexl.cgi). -Alternatively, you can pull it from the central Maven repositories: +Alternatively, you can pull it from the central Maven repositories: ```xml <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jexl3</artifactId> - <version>3.4.0</version> + <version>3.5.0</version> </dependency> ``` @@ -89,7 +89,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 767c1365..54ca12cb 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,3 +1,62 @@ + +Apache Commons JEXL 3.5.0 Release Notes + +Introduction +------------ + +Apache Commons JEXL is a library that facilitates the implementation of scripting features in + applications and frameworks written in Java. + +This is a feature and maintenance release. Java 8 or later is required. + +New features +------------ + +o JEXL-438: Allow parser factory specification. Thanks to Yair Lenga. +o JEXL-428: Make Comparable object high priority while comparing. Thanks to Xu Pengcheng. +o JEXL-427: Avoid coercing logical expressions to boolean. Thanks to Xu Pengcheng. +o JEXL-426: Enable pass-by-reference for Captured Variables. Thanks to Xu Pengcheng. +o Add and use CoercionException.CoercionException(String, Throwable). Thanks to Gary Gregory. + +Fixed Bugs +---------- + +o JEXL-436: The increment (decrement) operator does not check for null operand Thanks to Vincent Bussol. +o JEXL-435: Changed behavior of empty operator overloading Action. Thanks to Vincent Bussol. +o JEXL-434: The safe-access array operator is not safe. Thanks to Vincent Bussol. +o JEXL-433: Debugger does not accept empty return statement. Thanks to Vincent Bussol. +o JEXL-432: Namespace functors are not cleared when the classloader is updated. Thanks to Vincent Bussol. +o JEXL-431: Parse error with variables declared in a catch clause. Thanks to Vincent Bussol. +o JEXL-429: Ternary expression regression. Thanks to Shuo Geng. +o JEXL-425: Multiline format literals does not always return string. Thanks to Xu Pengcheng. +o Replace NumberParser use of Locale.ENGLISH with Locale.ROOT. Thanks to Gary Gregory. +o Pick up maven-antrun-plugin version from parent POM org.apache:apache. Thanks to Gary Gregory. + +Changes +------- + +o Bump org.apache.commons:commons-parent from 71 to 79 #279, #282, #287, #291, #295, #301. Thanks to Gary Gregory. +o Bump commons-logging:commons-logging from 1.3.2 to 1.3.5 #267, #280, #325. +o Bump org.codehaus.mojo:animal-sniffer-maven-plugin from 1.23 to 1.24 #266. +o Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 #270, #274, #283. +o Bump org.ow2.asm:asm from 9.7 to 9.7.1 #294. Thanks to Dependabot, Gary Gregory. +o Bump com.google.code.gson:gson from 2.11.0 to 2.13.0 #321. Thanks to Dependabot, Gary Gregory. + + +Historical list of changes: https://commons.apache.org/proper/commons-jexl/changes.html + +For complete information on Apache Commons JEXL, including instructions on how to submit bug reports, +patches, or suggestions for improvement, see the Apache Commons JEXL website: + +https://commons.apache.org/proper/commons-jexl/ + +Download page: https://commons.apache.org/proper/commons-jexl/download_jexl.cgi + +Have fun! +-Apache Commons Team + +------------------------------------------------------------------------------ + Apache Commons JEXL Version 3.4.1 Release Notes diff --git a/pom.xml b/pom.xml index 092a3191..0cf37e9e 100644 --- a/pom.xml +++ b/pom.xml @@ -79,9 +79,9 @@ <!-- Attempt at Java 25 --> <commons.asm.version>9.8</commons.asm.version> <!-- Commons release plugin --> - <commons.bc.version>3.3</commons.bc.version> - <commons.release.version>3.4.0</commons.release.version> - <commons.release.next>3.5.0</commons.release.next> + <commons.bc.version>3.4.0</commons.bc.version> + <commons.release.version>3.5.0</commons.release.version> + <commons.release.next>3.5.1</commons.release.next> <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 d8578788..43ae5241 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -27,7 +27,7 @@ <author email="d...@commons.apache.org">Commons Developers</author> </properties> <body> - <release version="3.5.0" date="YYYY-MM-DD" description="This is a feature and maintenance release. Java 8 or later is required."> + <release version="3.5.0" date="2025-04-11" description="This is a feature and maintenance release. Java 8 or later is required."> <!-- FIX --> <action dev="henrib" type="fix" issue="JEXL-436" due-to="Vincent Bussol"> The increment (decrement) operator does not check for null operand diff --git a/src/site/xdoc/download_jexl.xml b/src/site/xdoc/download_jexl.xml index e9bb2a8f..5564bf26 100644 --- a/src/site/xdoc/download_jexl.xml +++ b/src/site/xdoc/download_jexl.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 JEXL</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 JEXL"> @@ -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 JEXL 3.4.0 "> + <section name="Apache Commons JEXL 3.5.0 "> <subsection name="Binaries"> <table> <tr> - <td><a href="[preferred]/commons/jexl/binaries/commons-jexl-3.4.0-bin.tar.gz">commons-jexl-3.4.0-bin.tar.gz</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.4.0-bin.tar.gz.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.4.0-bin.tar.gz.asc">pgp</a></td> + <td><a href="[preferred]/commons/jexl/binaries/commons-jexl-3.5.0-bin.tar.gz">commons-jexl-3.5.0-bin.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.5.0-bin.tar.gz.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.5.0-bin.tar.gz.asc">pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/jexl/binaries/commons-jexl-3.4.0-bin.zip">commons-jexl-3.4.0-bin.zip</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.4.0-bin.zip.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.4.0-bin.zip.asc">pgp</a></td> + <td><a href="[preferred]/commons/jexl/binaries/commons-jexl-3.5.0-bin.zip">commons-jexl-3.5.0-bin.zip</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.5.0-bin.zip.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/binaries/commons-jexl-3.5.0-bin.zip.asc">pgp</a></td> </tr> </table> </subsection> <subsection name="Source"> <table> <tr> - <td><a href="[preferred]/commons/jexl/source/commons-jexl-3.4.0-src.tar.gz">commons-jexl-3.4.0-src.tar.gz</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.4.0-src.tar.gz.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.4.0-src.tar.gz.asc">pgp</a></td> + <td><a href="[preferred]/commons/jexl/source/commons-jexl-3.5.0-src.tar.gz">commons-jexl-3.5.0-src.tar.gz</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.5.0-src.tar.gz.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.5.0-src.tar.gz.asc">pgp</a></td> </tr> <tr> - <td><a href="[preferred]/commons/jexl/source/commons-jexl-3.4.0-src.zip">commons-jexl-3.4.0-src.zip</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.4.0-src.zip.sha512">sha512</a></td> - <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.4.0-src.zip.asc">pgp</a></td> + <td><a href="[preferred]/commons/jexl/source/commons-jexl-3.5.0-src.zip">commons-jexl-3.5.0-src.zip</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.5.0-src.zip.sha512">sha512</a></td> + <td><a href="https://downloads.apache.org/commons/jexl/source/commons-jexl-3.5.0-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 588df781..8ea64857 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 JEXL 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 JEXL please do the following: + </p> <ol> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310479&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=12310479&issuetype=1&priority=4&assignee=-1">bug report</a> or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310479&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 JEXL 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=12310479&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4">All Open Apache Commons JEXL bugs</a></li> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310479&sorter/field=issuekey&sorter/order=DESC&status=5&status=6">All Resolved Apache Commons JEXL bugs</a></li> <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310479&sorter/field=issuekey&sorter/order=DESC">All Apache Commons JEXL 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 767ea633..ae753ee6 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 JEXL 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>[jexl] Problem with the ...</li> - </ul> </p> + <ul> + <li>[jexl] Problem with the ...</li> + </ul> <p> Questions related to the usage of Apache Commons JEXL should be posted to the <a href="https://lists.apache.org/list.html?u...@commons.apache.org">User List</a>.