Skip to content

Sachin/plat 15367 remove bugsnag buildreport and settimeout#253

Draft
SB-sachinp wants to merge 5 commits intointegration/uplift-2025from
sachin/PLAT-15367-Remove-Bugsnag-buildreport-and-settimeout
Draft

Sachin/plat 15367 remove bugsnag buildreport and settimeout#253
SB-sachinp wants to merge 5 commits intointegration/uplift-2025from
sachin/PLAT-15367-Remove-Bugsnag-buildreport-and-settimeout

Conversation

@SB-sachinp
Copy link
Copy Markdown

No description provided.

@SB-sachinp SB-sachinp marked this pull request as draft April 21, 2026 10:29
@SB-sachinp SB-sachinp closed this Apr 21, 2026
@SB-sachinp SB-sachinp reopened this Apr 21, 2026
@SB-sachinp
Copy link
Copy Markdown
Author

@copilot resolve the merge conflicts in this pull request

…Bugsnag-buildreport-and-settimeout

Co-authored-by: SB-sachinp <256299276+SB-sachinp@users.noreply.github.com>
Copy link
Copy Markdown

Copilot AI commented Apr 21, 2026

@copilot resolve the merge conflicts in this pull request

Merge conflicts have been resolved in commit 4d7e528. The conflicts were:

  1. JakartaServletCallbackTest.java — kept the BugsnagEvent renaming from integration/uplift-2025, and replaced the generateReport() helper (which called bugsnag.buildReport()) with direct new BugsnagEvent(bugsnag.getConfig(), ...) construction, consistent with this PR's goal of removing buildReport usage.
  2. JavaxServletCallbackTest.java — removed (file was deleted in integration/uplift-2025).
  3. Dockerfile.java17-mazerunner — used the base branch version (both changed the FROM tag identically; base branch also added a blank line and updated settings.gradlesettings.gradle.kts).
  4. Dockerfile.java8-mazerunner — removed (file was deleted in integration/uplift-2025).

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