Skip to content

Merge regenerated Java SDK from main into master#41

Merged
kwent merged 2 commits intomasterfrom
merge-main-to-master
May 7, 2026
Merged

Merge regenerated Java SDK from main into master#41
kwent merged 2 commits intomasterfrom
merge-main-to-master

Conversation

@kwent
Copy link
Copy Markdown
Member

@kwent kwent commented May 7, 2026

Summary

  • Brings regenerated SDK (openapi-generator v7.13.0) from main into master
  • Preserves master's SHA-pinned workflow actions (checkout@v6, setup-java@v5)
  • Includes jackson-databind-nullable 0.2.10 fix
  • Updated Makefile with test stub cleanup before regeneration

Note

Resolved merge conflicts favoring main's regenerated code, keeping master's CI config.

kwent added 2 commits May 7, 2026 01:43
Brings regenerated SDK from main into master (default branch).
Preserves master's SHA-pinned workflow actions (v6/v5).
Includes jackson-databind-nullable 0.2.10 fix and updated
Makefile with test stub cleanup.
…ated

New files generated on main used javax.annotation which isn't in
the dependency tree. Master uses jakarta.annotation — align all
files to match.
@kwent kwent requested a review from Hchanni May 7, 2026 18:01
@kwent kwent merged commit a5d621b into master May 7, 2026
3 checks passed
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