From 4de2a9d57d76446f709bb25a4575e55c91799c80 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 27 Mar 2018 00:35:40 +0200
Subject: [PATCH 1/2] Add missing @since tag and silence API error

These methods were introduced for 4.11.1 so we have to silence the API
error adding API in a service release raises.

Change-Id: Ic847cebbed439912d3979ec2ec1809f77a28f61e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 org.eclipse.jgit/.settings/.api_filters                   | 8 ++++++++
 .../src/org/eclipse/jgit/lib/ObjectIdSerializer.java      | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index dd960907f..d4a059110 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -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.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>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSerializer.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSerializer.java
index 96c7cee1c..4f8bd326b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSerializer.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSerializer.java
@@ -108,6 +108,7 @@ public static void write(OutputStream out, @Nullable AnyObjectId id)
 	 *            the object id to serialize; never null
 	 * @throws IOException
 	 *             the stream writing failed
+	 * @since 4.11
 	 */
 	public static void writeWithoutMarker(OutputStream out, @NonNull AnyObjectId id)
 			throws IOException {
@@ -147,6 +148,7 @@ public static ObjectId read(InputStream in) throws IOException {
 	 * @return the object id; never null
 	 * @throws IOException
 	 *             there was an error reading the stream
+	 * @since 4.11
 	 */
 	@NonNull
 	public static ObjectId readWithoutMarker(InputStream in) throws IOException {

From a263bb11733de8d8113c5ad72030785bc95ebf33 Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 27 Mar 2018 00:33:00 +0200
Subject: [PATCH 2/2] Remove package import for javax.servlet.http from
 org.eclipse.jgit

This package import is unused.

Change-Id: I9f202bb3162736a1ef8054516f1a3145d3a7bb9b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 org.eclipse.jgit/META-INF/MANIFEST.MF | 1 -
 1 file changed, 1 deletion(-)

diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index 6528e059c..0201aa89a 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -151,7 +151,6 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
  com.jcraft.jsch;version="[0.1.37,0.2.0)",
  javax.crypto,
  javax.net.ssl,
- javax.servlet.http;version="[2.5.0,3.2.0)",
  org.slf4j;version="[1.7.0,2.0.0)",
  org.xml.sax,
  org.xml.sax.helpers