Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion .github/DEPENDENCY_DECISIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

Initial review: 2026-09-26. Focused API follow-up: 2026-09-27. Dependabot
proposal-policy follow-up: 2026-09-28. Jackson and proposal-routing follow-up:
2026-10-05. Maven 3.10.0 wrapper follow-up: 2026-10-11.
2026-10-05. Maven 3.10.0 wrapper follow-up: 2026-10-11. Maven 3.10.1 wrapper
follow-up: 2026-11-16.

PRs [#176](https://github.com/OWASP/owasp-java-encoder/pull/176) and
[#188](https://github.com/OWASP/owasp-java-encoder/pull/188) mixed ordinary build
Expand Down Expand Up @@ -174,6 +175,25 @@ realms. The publisher realm was resolved, not executed, because there is no
publishing run that skips signing and Central credentials. The next signed
release rehearsal should confirm it before a release relies on it.

## Maven 3.10.1 wrapper — 2026-11-16

Accept the Maven **3.10.1** distribution proposed by Dependabot PR
[#267](https://github.com/OWASP/owasp-java-encoder/pull/267). As with #235, that
PR failed only on the wrapper version assertion and re-committed `mvnw.cmd` with
CRLF in the index, so a separate change completes the checklist above. The
wrapper scripts remain Apache Maven Wrapper 3.3.4 and `mvnw.cmd` is unchanged.
The signing profile now requires exactly 3.10.1. Ordinary builds keep the
`[3.9.16,)` minimum.

3.10.1 is a bugfix release for 3.10.0 with Resolver 2.0.25 and no listed
security fixes ([release notes](https://maven.apache.org/docs/3.10.1/release-notes.html)).
The ZIP's SHA-256 and SHA-512 match, and its signature verifies against Apache
Maven's `KEYS`. Effective POMs from 3.10.0 and 3.10.1 are identical, and JARs
and module POMs built by each are byte-identical. The 1.6.0 publication already
exercised 3.10.0's credential scoping against Central. The reference-JDK
reproducibility script still needs to run before the next release; see the
[Maven 3.10.1 validation](../releases/maven-3.10.1-validation.md).

## Deferred proposals and reconsideration conditions

| Proposal | Disposition and required evidence before reconsideration |
Expand Down
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip
distributionSha256Sum=1f6d9909266510f039f59aa0e13dcd2c66da85f043e56276e41f2918f8bddaff
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.1/apache-maven-3.10.1-bin.zip
distributionSha256Sum=9c1ef9174ef250a5009ed0dec97cbe8699acf7479add4e62bf7b0ea791c0adb5
6 changes: 3 additions & 3 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

Use JDK 17+ and the committed `./mvnw` (`mvnw.cmd` on Windows). The wrapper is
Apache Maven Wrapper 3.3.4's unmodified `only-script` distribution; no wrapper
JAR executes before the download check. It pins Maven 3.10.0 and its SHA-256.
JAR executes before the download check. It pins Maven 3.10.1 and its SHA-256.
The downloaded Maven ZIP was independently compared to the SHA-512 served at
[Apache's distribution site](https://downloads.apache.org/maven/maven-3/3.10.0/binaries/).
[Apache's distribution site](https://downloads.apache.org/maven/maven-3/3.10.1/binaries/).
The separate [Maven Wrapper 3.3.4 only-script archive](https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper-distribution/3.3.4/maven-wrapper-distribution-3.3.4-only-script.zip)
(`maven-wrapper-distribution-3.3.4-only-script.zip`) has SHA-256
`6cb584c2bc907b849a0b931d8266d3ff3214cdd3127115ed4f49fb7176413d36`.
The Maven 3.10.0 ZIP checksum is recorded in
The Maven 3.10.1 ZIP checksum is recorded in
[the wrapper configuration](.mvn/wrapper/maven-wrapper.properties).
Both bootstrap paths are CI gates, including a deliberately wrong checksum with
an empty wrapper cache. `.mvn/maven.config` requires strict transfer checksums.
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ unchanged. [1.6.0 is available from Central](releases/1.6.0-central-publication.
plugin realms and the Jakarta fixture's Selenium tests, and raise the
fixture's OpenTelemetry to 1.67.0, for GHSA-xxph-c9ww-hj94 and
GHSA-ccrj-gw8r-854m. Published library dependencies are unchanged.
- Build with Maven 3.10.1, a 3.10.0 bugfix release, through the committed
wrapper and require it for signed releases. Ordinary builds still accept
Maven 3.9.16 or later ([validation](releases/maven-3.10.1-validation.md)).

## 1.6.0 — 2026-10-18 UTC

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ container or downstream dependency combination.

## Building and contributing

Build with JDK 17 and the committed wrapper (Maven 3.10.0); use `mvnw.cmd` on Windows:
Build with JDK 17 and the committed wrapper (Maven 3.10.1); use `mvnw.cmd` on Windows:

```sh
./mvnw clean verify
Expand Down
2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ existing Maven version.
## Prepare and verify

1. Use a clean checkout, **Eclipse Temurin 17.0.20.1+1** and the committed
wrapper (**Maven 3.10.0**). The signing profile enforces vendor, exact runtime
wrapper (**Maven 3.10.1**). The signing profile enforces vendor, exact runtime
and Maven versions, and a non-SNAPSHOT project version. Ordinary builds allow
JDK 17+; the release path is stricter because javac output changes on newer
JDKs. Record the full Git commit and operating system/architecture. Build with a fresh Maven local repository so
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@
<requireReleaseVersion/>
<requireJavaVendor><includes><include>Eclipse Adoptium</include></includes></requireJavaVendor>
<requireProperty><property>java.runtime.version</property><regex>17\.0\.20\.1\+1</regex></requireProperty>
<requireMavenVersion><version>[3.10.0]</version></requireMavenVersion>
<requireMavenVersion><version>[3.10.1]</version></requireMavenVersion>
</rules></configuration>
</execution>
</executions>
Expand Down
70 changes: 70 additions & 0 deletions releases/maven-3.10.1-validation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# Maven 3.10.1 wrapper validation — 2026-11-16

This record supports the toolchain decision in the
[dependency decision record](../.github/DEPENDENCY_DECISIONS.md) and replaces
Dependabot PR [#267](https://github.com/OWASP/owasp-java-encoder/pull/267).
The local checks below ran on macOS 27.2.1 (26B131) arm64. Windows wrapper
bootstrap and the other runtime jobs are checked by required PR CI and are not
claimed here.

## Distribution

`apache-maven-3.10.1-bin.zip` from `downloads.apache.org` and from Maven Central
are byte-identical. Its SHA-512 matches the `.sha512` file Apache publishes, and its
SHA-256 `9c1ef9174ef250a5009ed0dec97cbe8699acf7479add4e62bf7b0ea791c0adb5`
matches `distributionSha256Sum`. The detached signature is a good signature from
key `88BE34F94BDB2B5357044E2E3A387D43964143E3` (Tamas Cservenak, made
2026-11-11), the same key that signed 3.10.0, checked in an isolated keyring that
held only Apache Maven's `KEYS`. `KEYS` and the ZIP come from the same publisher,
so the signature check does not independently establish publisher identity. The
wrapper scripts stay Apache Maven Wrapper 3.3.4, and `mvnw.cmd` is unchanged and
LF in the index.

## Release scope

The [release notes](https://maven.apache.org/docs/3.10.1/release-notes.html)
describe 3.10.1 as a bugfix release for 3.10.0: regression fixes, Maven 4
backports and lighter startup (JLine is replaced by plain ANSI color codes). It
moves to Resolver 2.0.25 and Sisu 1.1.2 and lists no security fixes. The
potentially breaking changes listed on that page are the 3.10.0 changes already
reviewed for the 3.10.0 wrapper; none is new in 3.10.1.

One listed known issue applies to installs: Maven logs a warning with a stack
trace ("Invalid cross-device link") when the build directory and local
repository are on different volumes. The builds below did not hit it, and
`-Daether.installer.hardLink=false` avoids it.

## Build and wrapper

With 3.10.1, `./mvnw -B -ntp clean verify` passed with Homebrew OpenJDK
17.0.20.1 and a warm local repository: 2,302 unit tests, seven integration
tests, Checkstyle, API and Java 8 signature checks, coverage and both packaged
JSP engines. `python3 scripts/check-wrapper.py` bootstrapped 3.10.1 from an
empty wrapper cache and rejected an incorrect checksum. All 36 policy tests
passed. The legacy `jvnet-nexus-releases` `.meta/prefixes.txt` warning recorded
for 3.10.0 is unchanged.

## Effective POMs

`help:effective-pom` from 3.10.0 and 3.10.1 was compared for the same source
tree, both by default and with `-DperformRelease=true`. Apart from the
generator comment, both outputs are identical.

## Payloads

`main` at `c935f1cc9594cd1d3baee2fd2337f46bd01995b2` (Maven 3.10.0) and the
implementation commit `944527e` (Maven 3.10.1) were each
built from a fresh `git archive` export with its own empty Maven repository and
wrapper cache, using `-DskipTests clean install` and the UTC/locale settings of
`scripts/check-reproducible.py`, on Homebrew OpenJDK 17.0.20.1. All nine JARs
and three module POMs are byte-identical. The parent POM differs only in the
release enforcer's `[3.10.0]` → `[3.10.1]` line.

## Not exercised

`scripts/check-reproducible.py` did not run: it requires reference Eclipse
Temurin 17.0.20.1+1, which is not installed here. The payload comparison above
used a different JDK build, so it shows that the Maven version does not change
artifact bytes, not that the release recipe reproduces. Run that script with the
reference JDK before the next release. No signing, Central Portal staging, tag
or release operation ran.
2 changes: 1 addition & 1 deletion scripts/check-reproducible.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def main():
raise ValueError('Expected thirteen release payload files')
results.append(hashes)
differences = [name for name in results[0] if results[0][name] != results[1][name]]
report = {'commit': commit, 'java': props, 'maven': '3.10.0',
report = {'commit': commit, 'java': props, 'maven': '3.10.1',
'hashes': results, 'differences': differences}
(directory / 'comparison.json').write_text(json.dumps(report, indent=2) + '\n')
require_identical(results[0], results[1])
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def bootstrap(directory, bad_hash):
if result.returncode == 0 or 'SHA-256' not in result.stdout:
raise ValueError('Checksum rejection did not work: ' + result.stdout)
else:
if result.returncode != 0 or 'Apache Maven 3.10.0' not in result.stdout:
if result.returncode != 0 or 'Apache Maven 3.10.1' not in result.stdout:
raise ValueError('Wrapper bootstrap failed: ' + result.stdout)
print(('Rejected incorrect checksum' if bad_hash else 'Verified bootstrap'), WRAPPER)

Expand Down
Loading