Skip to content

Main into 7.0.x#295

Merged
leerho merged 19 commits into
7.0.Xfrom
main_into_7.0.X
Jun 11, 2026
Merged

Main into 7.0.x#295
leerho merged 19 commits into
7.0.Xfrom
main_into_7.0.X

Conversation

@leerho

@leerho leerho commented Jun 11, 2026

Copy link
Copy Markdown
Member

This transfers the updates to main, which were in the context of adding Java 25 into the mix, into the release branch 7.0.X.

leerho and others added 19 commits June 8, 2026 17:50
And add dependabot.yml
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…/checkout-6

Bump actions/checkout from 5 to 6
@tisonkun

Copy link
Copy Markdown
Member

Wrong base branch and the changeset doesn't include #294?

@leerho leerho changed the base branch from main to 7.0.X June 11, 2026 02:08
@leerho

leerho commented Jun 11, 2026

Copy link
Copy Markdown
Member Author

My mistake. Once I corrected the target the changes in #294 (javadoc.yml) also showed up.

@leerho

leerho commented Jun 11, 2026

Copy link
Copy Markdown
Member Author

Thanks!

@leerho leerho merged commit 9273047 into 7.0.X Jun 11, 2026
13 checks passed
@leerho leerho deleted the main_into_7.0.X branch June 11, 2026 04:33
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.

2 participants