Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-03-26 22:35:40 +0000
committerMatthias Sohn2018-03-26 22:35:40 +0000
commit4de2a9d57d76446f709bb25a4575e55c91799c80 (patch)
tree604a6d480cfd2a01ba44c97752f612df662783b1
parent61e4f1665221626cfd31a5826bff527ef7ce5719 (diff)
downloadjgit-4de2a9d57d76446f709bb25a4575e55c91799c80.tar.gz
jgit-4de2a9d57d76446f709bb25a4575e55c91799c80.tar.xz
jgit-4de2a9d57d76446f709bb25a4575e55c91799c80.zip
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>
-rw-r--r--org.eclipse.jgit/.settings/.api_filters8
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSerializer.java2
2 files changed, 10 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index dd960907fb..d4a059110b 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 96c7cee1c6..4f8bd326b7 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 class ObjectIdSerializer {
* 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 class ObjectIdSerializer {
* @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 {

Back to the top