diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-06 18:17:22 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-04-06 18:17:22 +0200 |
| commit | 7adacbd19a717cf831876c9d2cfbc9a75fa18672 (patch) | |
| tree | 1476be2a5466c7da2ea2bb4845314a562e1c467d /org.eclipse.jgit | |
| parent | 4e8655c74dc8dec620c58fb965e8fa836212aa4c (diff) | |
| download | jgit-7adacbd19a717cf831876c9d2cfbc9a75fa18672.tar.gz jgit-7adacbd19a717cf831876c9d2cfbc9a75fa18672.zip | |
Silence API error for new method added to abstract MergeStrategy
OSGi semantic versioning rules allow to break implementors of an API in
a minor version.
Change-Id: I4ada3e6455e8e8e1bb8fb71affa0a1b36bd46fc4
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 6441232363..03c6ce5010 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -43,6 +43,14 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/merge/MergeStrategy.java" type="org.eclipse.jgit.merge.MergeStrategy"> + <filter comment="OSGi semantic versioning allows breaking implementors of an API in a minor version" id="336695337"> + <message_arguments> + <message_argument value="org.eclipse.jgit.merge.MergeStrategy"/> + <message_argument value="newMerger(ObjectInserter, Config)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection"> <filter comment="OSGi semantic versioning rules allow to break implementors in minor releases" id="403767336"> <message_arguments> |