Repository navigation
Restore pom.xml dependencies lost in the #8 merge resolution - #14
Open
shrish-browserstack wants to merge 1 commit into
Open
shrish-browserstack wants to merge 1 commit into
shrish-browserstack wants to merge 1 commit into
Conversation
…ution The squash of ShrishRajGupta#8 (5be27ca) resolved a pom.xml conflict against ShrishRajGupta#7 by keeping the pre-ShrishRajGupta#8 dependency block. That dropped spring-kafka, flyway-core and flyway-mysql while the Kafka classes and Java migrations that need them stayed, so main no longer compiles (CI on 5be27ca: "package org.apache.kafka.clients.consumer does not exist"). It also re-added jacoco-maven-plugin as a runtime dependency and removed the compiler's -parameters flag. This restores pom.xml to exactly what ShrishRajGupta#8's head commit (c298808) had, which is the state the rest of the open stack (ShrishRajGupta#9-ShrishRajGupta#13) was built and verified on. No other file differs between main and that commit. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
mainhas been red since the squash of #8 (5be27ca). The conflict inpom.xmlbetween #7 and #8 was resolved by keeping the pre-#8 dependency block, which droppedspring-kafka,flyway-coreandflyway-mysqlwhile the Kafka classes and Java migrations that need them stayed.CI on 5be27ca fails with:
The same resolution also re-added
jacoco-maven-pluginas a runtime dependency (it is a build plugin) and removed the compiler's-parametersflag.What
One commit that sets
pom.xmlback to exactly what #8's head commit (c298808) contained.pom.xmlis the only file that differs betweenmainand that commit, so after this PRmain's tree equals the state the rest of the open stack was built and verified on.Verification
mvn clean verifyon this branch: 28 tests, 0 failures, jar produced.mvn clean verifyon the stack tip rebased on top of this: 116 tests, 0 failures, 4 skipped (Docker-only suite), coverage gate passed.Merge order
#9 → #13 have been rebased onto this branch, so merge this first: #14 → #9 → #10 → #11 → #12 → #13. Each PR is a single commit, so "Squash and merge" or "Rebase and merge" both leave the next PR conflict-free as long as no edits are made during the merge.
🤖 Generated with Claude Code