Skip to content

Jdk25#3839

Draft
shroffk wants to merge 5 commits into
masterfrom
jdk25
Draft

Jdk25#3839
shroffk wants to merge 5 commits into
masterfrom
jdk25

Conversation

@shroffk

@shroffk shroffk commented Jun 17, 2026

Copy link
Copy Markdown
Member

Checklist

  • Testing:

    • The feature has automated tests
    • Tests were run
    • If not, explain how you tested your changes
  • Documentation:

    • The feature is documented
    • The documentation is up to date
    • Release notes:
      • Added an entry if the change is breaking or significant
      • Added an entry when adding a new feature

@shroffk

shroffk commented Jun 17, 2026

Copy link
Copy Markdown
Member Author

Arghhh,
I need to move the services to a newer springboot version ( trying 4.1.0 ), but that is not as simple as just updating the version.

@shroffk

shroffk commented Jun 29, 2026

Copy link
Copy Markdown
Member Author

@copilot resolve the merge conflicts in this pull request

Copilot AI commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts in commit 4a2678f. I merged origin/master, accepted the workflow deletions that happened on master, and resolved the pom.xml conflict by keeping surefire 3.2.5 with the *FXTest exclusion config.

@sonarqubecloud

Copy link
Copy Markdown

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