Skip to content

Restore springboot/v3 to Spring Boot 3.x (remove v4 changes) - #34

Merged
fitzget merged 1 commit into
springboot/v3from
fix/restore-springboot-v3
Nov 17, 2026
Merged

fitzget merged 1 commit into
springboot/v3from
fix/restore-springboot-v3

Conversation

@fitzget

@fitzget fitzget commented Nov 17, 2026

Copy link
Copy Markdown
Contributor

Summary

`springboot/v3` on the remote contains Spring Boot 4 changes that were merged in from `springboot/v4` by PR #32 (commit `d1a5b33`). This PR restores the branch to the Spring Boot 3.x code.

The tree of this PR matches local `springboot/v3` (`c57dbc7`). That commit is the Spring Boot 3.5.16 version, and includes the `HtmlUtils.htmlEscape` fix for CodeQL alert 5.

Why

  • Remote `pom.xml` on `springboot/v3` shows Spring Boot `4.1.2` and Java 21.
  • The Spring Boot 3 version should be 3.5.16 with Java 17.
  • Spring Boot 4 belongs only on `springboot/v4`.

Review notes

  • The diff is the removal of the v4 changes. Please check `pom.xml`, `build.gradle`, `gradle.properties`, `etc/config/liberty/server.xml` and the `.settings` / `.classpath` files.
  • Commit history is kept: no force push. This PR adds a commit on top of `d1a5b33`.

Commit d1a5b33 (merge of PR #32 from springboot/v4) brought Spring Boot 4 changes
onto springboot/v3. This commit restores the springboot/v3 tree to match the
Spring Boot 3.5.16 code, keeping the HtmlUtils.htmlEscape fix from c57dbc7.
@fitzget
fitzget requested a review from a team as a code owner November 17, 2026 13:04
@github-advanced-security

Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

@fitzget
fitzget merged commit f22cca3 into springboot/v3 Nov 17, 2026
15 checks passed
@IvanHargreaves
IvanHargreaves deleted the fix/restore-springboot-v3 branch November 17, 2026 20:19
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.

3 participants