Silence API warnings for reintroduced ResolveMerger#processEntry
This was silenced before but suppression was unintentionally lost in merge commit6858339c1e
. This method was removed in 4.9.0 and reintroduced in 4.9.1 to avoid breaking EMF compare versions which were built against older versions. See:abf420302b
Change-Id: I152d58ac885e044bcab682b9423f6cc83b667989 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
bac4d32d39
commit
d2a23afb53
|
@ -1,5 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<component id="org.eclipse.jgit" version="2">
|
||||
<resource path="META-INF/MANIFEST.MF">
|
||||
<filter id="924844039">
|
||||
<message_arguments>
|
||||
<message_argument value="4.9.1"/>
|
||||
<message_argument value="4.9.0"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
|
||||
<filter id="336658481">
|
||||
<message_arguments>
|
||||
|
@ -47,6 +55,15 @@
|
|||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
|
||||
<filter id="1141899266">
|
||||
<message_arguments>
|
||||
<message_argument value="3.5"/>
|
||||
<message_argument value="4.9"/>
|
||||
<message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/>
|
||||
</message_arguments>
|
||||
</filter>
|
||||
</resource>
|
||||
<resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection">
|
||||
<filter id="403767336">
|
||||
<message_arguments>
|
||||
|
|
Loading…
Reference in New Issue