Skip to content

Sync latest upstream OWASP-Benchmark/BenchmarkJava commits - #13

Merged
fgibelin merged 9 commits into
masterfrom
fgibelin-sync-upstream-fork-3bc
Oct 14, 2026
Merged

fgibelin merged 9 commits into
masterfrom
fgibelin-sync-upstream-fork-3bc

Conversation

@fgibelin

Copy link
Copy Markdown
Owner

Summary

Merge upstream OWASP-Benchmark/BenchmarkJava:master through 0a3113b70 while preserving fork-specific history.

Includes eight upstream commits updating:

  • commons-codec: 1.22.1 → 1.23.0
  • httpclient5: 5.6.4 → 5.6.5
  • spotless-maven-plugin: 3.10.3 → 3.10.4
  • github/codeql-action: 4.38.2 → 4.38.3

Validation

  • Upstream tip is an ancestor of the sync branch.
  • Diff whitespace check passed.
  • Merge is conditional on all PR checks passing.

dependabot Bot and others added 9 commits October 13, 2026 07:08
Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 3.10.3 to 3.10.4.
- [Release notes](https://github.com/diffplug/spotless/releases)
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](diffplug/spotless@maven/3.10.3...maven/3.10.4)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-version: 3.10.4
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [commons-codec:commons-codec](https://github.com/apache/commons-codec) from 1.22.1 to 1.23.0.
- [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt)
- [Commits](apache/commons-codec@rel/commons-codec-1.22.1...rel/commons-codec-1.23.0)

---
updated-dependencies:
- dependency-name: commons-codec:commons-codec
  dependency-version: 1.23.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.httpcomponents.client5:httpclient5](https://github.com/apache/httpcomponents-client) from 5.6.4 to 5.6.5.
- [Changelog](https://github.com/apache/httpcomponents-client/blob/rel/v5.6.5/RELEASE_NOTES.txt)
- [Commits](apache/httpcomponents-client@rel/v5.6.4...rel/v5.6.5)

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents.client5:httpclient5
  dependency-version: 5.6.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.38.2 to 4.38.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v4.38.2...v4.38.3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.38.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…t/maven/com.diffplug.spotless-spotless-maven-plugin-3.10.4

Bump com.diffplug.spotless:spotless-maven-plugin from 3.10.3 to 3.10.4
…t/maven/org.apache.httpcomponents.client5-httpclient5-5.6.5

Bump org.apache.httpcomponents.client5:httpclient5 from 5.6.4 to 5.6.5
…t/maven/commons-codec-commons-codec-1.23.0

Bump commons-codec:commons-codec from 1.22.1 to 1.23.0
…t/github_actions/github/codeql-action-4.38.3

Bump github/codeql-action from 4.38.2 to 4.38.3
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: bda1da0b-0320-4892-ad3d-2030486cb0d3
@fgibelin
fgibelin requested a balanced review from Copilot October 14, 2026 07:19
@fgibelin
fgibelin merged commit c9e5c2a into master Oct 14, 2026
6 checks passed
@fgibelin
fgibelin deleted the fgibelin-sync-upstream-fork-3bc branch October 14, 2026 07:23

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The version updates are valid, internally consistent, and introduce no identified regressions.

0 open findings

What changed in this PR

Synchronizes dependency and CI action versions with upstream OWASP BenchmarkJava.

Changes:

  • Updates three Maven dependencies/plugins.
  • Updates CodeQL actions to v4.38.3.
File Description
pom.xml Updates Commons Codec, HttpClient 5, and Spotless.
.github/​workflows/​codeql-analysis.yml Updates CodeQL initialization and analysis actions.

Review effort: Balanced

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants