Skip to content

Add japicmp maven plugin #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 7, 2021
Merged

Add japicmp maven plugin #424

merged 2 commits into from
Mar 7, 2021

Conversation

dinomite
Copy link
Member

@dinomite dinomite commented Mar 6, 2021

Replaces PR 347.

Resolves issue #345

@dinomite dinomite changed the base branch from master to 2.12 March 6, 2021 21:27
@dinomite dinomite mentioned this pull request Mar 6, 2021
@dinomite
Copy link
Member Author

dinomite commented Mar 6, 2021

@cowtowncoder Mainly adding you so you know this is actually going to be merged. We'll need to update the base version whenever methods are added or purposefully changed (I'll handling doing that).

@cowtowncoder
Copy link
Member

cowtowncoder commented Mar 7, 2021

Ok. This should help tracking changes, avoiding unintended compatibility affecting changes.

One note: make sure to merge this 2.12 -> 2.13, 2.13 -> master. I have merged a few PRs earlier but forgot to mention that there is no automatic process from merging from maintenance branches upwards toward master.
Merging itself is easy (git checkout 2.13; git merge 2.12; git push; ....) unless there are conflicts. I can help with this as necessary too but in general I think it best that whoever merges fix to a maintenance branch handles merging.

But one caveat here is that conflicts on pom.xml will result in omitting merge for it: this is due to setting in .gitattributes:

# Do not merge `pom.xml` from older version, as it will typically conflict
pom.xml merge=ours

added because otherwise there will always be bogus conflicts when releasing new versions from maintenance branches.

But downside is that changes to pom.xml need usually be manually merged: you can do a diff before committing to 2.12, or diff across versions.

@dinomite
Copy link
Member Author

dinomite commented Mar 7, 2021

Got it, I'll keep up on merging 👍 (and do it for this branch now)

@dinomite dinomite merged commit 791d854 into 2.12 Mar 7, 2021
@dinomite dinomite deleted the add-japicmp branch March 7, 2021 14:38
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