diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2014-07-30 17:01:56 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2014-07-31 00:02:17 +0200 |
| commit | adbf0541dc5f6febe2af099e5027fbe6d8a3db80 (patch) | |
| tree | 87a91d5053da2957282b1a5ddcc447032f978b25 /org.eclipse.jgit/.settings | |
| parent | efce3404741a9a8e47707b912e6be218112f9a9f (diff) | |
| download | jgit-adbf0541dc5f6febe2af099e5027fbe6d8a3db80.tar.gz jgit-adbf0541dc5f6febe2af099e5027fbe6d8a3db80.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 0b8473e719..01c243417a 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -8,4 +8,24 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger"> + <filter comment="Doesn't break consumers. Breaking providers is allowed also in minor versions." id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/> + <message_argument value="mergeTreeWalk(TreeWalk)"/> + </message_arguments> + </filter> + <filter comment="Doesn't break consumers. Breaking providers is allowed also in minor versions." id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/> + <message_argument value="mergeTrees(AbstractTreeIterator, RevTree, RevTree)"/> + </message_arguments> + </filter> + <filter comment="Doesn't break consumers. Breaking providers is allowed also in minor versions." id="338792546"> + <message_arguments> + <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/> + <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator)"/> + </message_arguments> + </filter> + </resource> </component> |