Merge branch 'stable-4.11'

* stable-4.11:
  Remove package import for javax.servlet.http from org.eclipse.jgit
  Add missing @since tag and silence API error

Change-Id: I2783a15ead26ab19de31a8fb3bfb148ef19de91a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit/.settings/.api_filters
index 0000000000000000000000000000000000000000,d4a059110ba214b66f432fb762e98751a484658f..3d36b880ea4952f20fc2515520985da8d5de3414
mode 000000,100644..100644
--- /dev/null
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,0 -1,67 +1,12 @@@
 -    <resource path="META-INF/MANIFEST.MF">
 -        <filter id="924844039">
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <component id="org.eclipse.jgit" version="2">
 -                <message_argument value="4.11.1"/>
 -                <message_argument value="4.11.0"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/diff/DiffEntry.java" type="org.eclipse.jgit.diff.DiffEntry">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.diff.DiffEntry"/>
 -                <message_argument value="diffAttribute"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
 -                <message_argument value="CONFIG_KEY_REQUIRED"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
 -                <message_argument value="CONFIG_SECTION_LFS"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
 -                <message_argument value="workingTreeOptions"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/storage/pack/PackStatistics.java" type="org.eclipse.jgit.storage.pack.PackStatistics$Accumulator">
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/>
 -                <message_argument value="advertised"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/>
 -                <message_argument value="haves"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/>
 -                <message_argument value="timeNegotiating"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="336658481">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackStatistics.Accumulator"/>
 -                <message_argument value="wants"/>
++    <resource path="src/org/eclipse/jgit/lib/ObjectIdSerializer.java" type="org.eclipse.jgit.lib.ObjectIdSerializer">
++        <filter id="1141899266">
+             <message_arguments>
++                <message_argument value="4.11"/>
++                <message_argument value="5.0"/>
++                <message_argument value="writeWithoutMarker(OutputStream, AnyObjectId)"/>
+             </message_arguments>
+         </filter>
+     </resource>
+ </component>

diff --cc org.eclipse.jgit/META-INF/MANIFEST.MF
Simple merge