From e2183d6170a250ad97289e4090e3faeec1eecadf Mon Sep 17 00:00:00 2001 From: kwwall Date: Sun, 18 May 2025 23:00:36 -0400 Subject: [PATCH 1/7] Prep 'develop' branch for next (SNAPSHOT) ESAPI release. --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b0928bacb..4c4218298 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ specific Jakarta version of ESAPI, in Maven, you would specify your ESAPI depend org.owasp.esapi esapi - 2.6.0.0 + 2.6.1.0 jakarta ``` @@ -105,7 +105,7 @@ link to the specific release notes. the ESAPI GitHub Discussion https://github.com/ESAPI/esapi-java-legacy/discussions/841. # Locating ESAPI Jar files -The [latest ESAPI release](https://github.com/ESAPI/esapi-java-legacy/releases/latest) is 2.6.0.0. +The [latest ESAPI release](https://github.com/ESAPI/esapi-java-legacy/releases/latest) is 2.6.1.0. All the *regular* ESAPI jars, with the exception of the ESAPI configuration jar (i.e., esapi-2.#.#.#-configuration.jar) and its associated detached GPG signature, are available from Maven Central. The ESAPI configuration diff --git a/pom.xml b/pom.xml index 5da4fd7e1..a0e8f95f8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.owasp.esapi esapi - 2.6.1.0 + 2.7.0.0-SNAPSHOT jar From 7067804af1ce9a700acd9ca0cd25c43052bcdfeb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 May 2025 10:35:16 -0400 Subject: [PATCH 2/7] Bump commons-beanutils:commons-beanutils from 1.9.4 to 1.11.0 (#881) Bumps commons-beanutils:commons-beanutils from 1.9.4 to 1.11.0. --- updated-dependencies: - dependency-name: commons-beanutils:commons-beanutils dependency-version: 1.11.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a0e8f95f8..f33ebd034 100644 --- a/pom.xml +++ b/pom.xml @@ -185,8 +185,8 @@ commons-beanutils commons-beanutils - - 1.9.4 + + 1.11.0 - 2024-11-25 00:00:00 + 2025-05-19 00:00:00 @@ -478,7 +478,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.1 + 3.5.0 diff --git a/scripts/vars.2.6.2.0 b/scripts/vars.2.6.2.0 new file mode 100644 index 000000000..0252e8603 --- /dev/null +++ b/scripts/vars.2.6.2.0 @@ -0,0 +1,14 @@ +# Do NOT edit this file directly. It will be created by the new createVarsFile.sh script, +# which should be run prior to the newReleaseNotes.sh script. + +# ESAPI (new / current) version +VERSION=2.6.2.0 + +# Previous ESAPI version +PREV_VERSION=2.6.1.0 + +# Release date of current version in yyyy-mm-dd format +YYYY_MM_DD_RELEASE_DATE=2025-06-01 + +# Previous ESAPI release date in same format +PREV_RELEASE_DATE=2025-05-19 From b68e75394390812c6c5f8382a40fb8b15955b594 Mon Sep 17 00:00:00 2001 From: kwwall Date: Mon, 2 Jun 2025 21:15:18 -0400 Subject: [PATCH 5/7] Correct release date and other minor changes. --- documentation/esapi4java-core-2.6.2.0-release-notes.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/esapi4java-core-2.6.2.0-release-notes.txt b/documentation/esapi4java-core-2.6.2.0-release-notes.txt index 63195628d..a909feea2 100644 --- a/documentation/esapi4java-core-2.6.2.0-release-notes.txt +++ b/documentation/esapi4java-core-2.6.2.0-release-notes.txt @@ -1,5 +1,5 @@ Release notes for ESAPI 2.6.2.0 - Release date: 2025-06-01 + Release date: 2025-06-02 Project leaders: -Kevin W. Wall -Matt Seil @@ -76,7 +76,7 @@ If you use ESAPI 2.5.0.0 or later, you will get an ClassNotFoundException as the Remaining Known Issues / Problems ----------------------------------------------------------------------------- -None known, other than the remaining open issues on GitHub. +None known, other than the remaining open issues on GitHub and that 'mvn site' fails to properly build some pieces as the ESAPI tag library Javadoc. I suspect this is related to problems with one or more of the Maven plugins. ----------------------------------------------------------------------------- @@ -84,7 +84,7 @@ None known, other than the remaining open issues on GitHub. ----------------------------------------------------------------------------- -* Changes since last release 2.6.1.0 and 2.6.2.0, i.e., changes between 2025-05-19 and 2025-06-01). +* Changes since last release 2.6.1.0 and 2.6.2.0, i.e., changes between 2025-05-19 and 2025-06-02). Note: I am no longer going to provide the 'Developer Activity Report' that I used to this manually create in tabluar form. This is in part because I use to use 'mvn site' to assist with its creation, but neither the 'Developer Activiity' nor 'File Activity' sections of the 'mvn site' output is currently working. From 38ce3a07c9a9cdb1c4b791be37c161c1ea675ba6 Mon Sep 17 00:00:00 2001 From: kwwall Date: Mon, 2 Jun 2025 21:15:51 -0400 Subject: [PATCH 6/7] Correct release date. --- scripts/vars.2.6.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vars.2.6.2.0 b/scripts/vars.2.6.2.0 index 0252e8603..244aeaf3b 100644 --- a/scripts/vars.2.6.2.0 +++ b/scripts/vars.2.6.2.0 @@ -8,7 +8,7 @@ VERSION=2.6.2.0 PREV_VERSION=2.6.1.0 # Release date of current version in yyyy-mm-dd format -YYYY_MM_DD_RELEASE_DATE=2025-06-01 +YYYY_MM_DD_RELEASE_DATE=2025-06-02 # Previous ESAPI release date in same format PREV_RELEASE_DATE=2025-05-19 From ba358e4955300b7e464fcd9d0c8dea31be1f8ad3 Mon Sep 17 00:00:00 2001 From: kwwall Date: Mon, 2 Jun 2025 21:17:04 -0400 Subject: [PATCH 7/7] Corrected version to 2.6.2.0; was 2.7.0.0-SNAPSHOT. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6299b8c20..43072de09 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.owasp.esapi esapi - 2.7.0.0-SNAPSHOT + 2.6.2.0 jar @@ -185,7 +185,7 @@ commons-beanutils commons-beanutils - + 1.11.0