Skip to content

Sync fork with upstream master - #17

Merged
fgibelin merged 2 commits into
masterfrom
fgibelin-sync-fork-d2d
Oct 28, 2026
Merged

fgibelin merged 2 commits into
masterfrom
fgibelin-sync-fork-d2d

Conversation

@fgibelin

Copy link
Copy Markdown
Owner

Summary

Merge the latest commits from OWASP-Benchmark/BenchmarkJava master into this fork, preserving fork-specific history.

Includes upstream commit f40c618c5a709afce350ef06ed2899c85cf586e9:

  • Upgrade JUnit to 5.14.4.
  • Share the JUnit version property between junit-jupiter-api and junit-jupiter-params.

Validation

GitHub Actions will run Maven formatting/build checks and CodeQL analysis. Merge only after all checks pass.

davewichers and others added 2 commits October 27, 2026 17:57
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

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

No active review issues were identified for the JUnit dependency version update and centralization.

No open issues 🎉

What changed in this PR

This PR syncs the fork with upstream master while preserving fork-specific history, bringing in the JUnit dependency update.

Changes:

  • Sets the shared version.junit property to 5.14.4.
  • Uses that property for both junit-jupiter-api and junit-jupiter-params.
File Description
pom.xml Centralizes the two JUnit dependency versions and updates them from 5.12.2 to 5.14.4.

Review effort: Balanced

@fgibelin
fgibelin merged commit 8608a5d into master Oct 28, 2026
6 checks passed
@fgibelin
fgibelin deleted the fgibelin-sync-fork-d2d branch October 28, 2026 09:05
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