]> source.dussan.org Git - jgit.git/commit
Fix API errors raised on ResolveMerger affecting API providers only 67/30767/2
authorChristian Halstrick <christian.halstrick@sap.com>
Wed, 30 Jul 2014 15:01:56 +0000 (17:01 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 30 Jul 2014 22:02:17 +0000 (00:02 +0200)
commitadbf0541dc5f6febe2af099e5027fbe6d8a3db80
tree87a91d5053da2957282b1a5ddcc447032f978b25
parentefce3404741a9a8e47707b912e6be218112f9a9f
Fix API errors raised on ResolveMerger affecting API providers only

In change If45bc3d078b3d3de87b758e71d7379059d709603 a new parameter was
added to 3 protected methods of ResolveMerger. This breaks the code of
developers which have subclassed ResolveMerger. The API baseline check
in Eclipse reports this as API breakage.

Since this will break only providers but not consumers of the API this
should be allowed also in minor versions. According to OSGi semantic
versioning
http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf
breaking providers in a minor version update is ok.

Therefore silence these errors using API filter rules.

Bug: 440757
Change-Id: Icabbd0e1de7e877c66a5c4a2c8391473f992a1aa
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeResult.java
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java