diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-03-27 00:51:05 +0200 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-03-26 16:35:30 -0700 |
| commit | 10d03a77a4690d1d44a86e6650e6dacd3815a5c8 (patch) | |
| tree | 332e75ff4bbbf08d6be2e6fcdd5b62c07cec7cd3 | |
| parent | 4bfc6c2ae9ec582575b05f4e63ee62212bb284a4 (diff) | |
| parent | a263bb11733de8d8113c5ad72030785bc95ebf33 (diff) | |
| download | jgit-10d03a77a4690d1d44a86e6650e6dacd3815a5c8.tar.gz jgit-10d03a77a4690d1d44a86e6650e6dacd3815a5c8.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 12 | ||||
| -rw-r--r-- | org.eclipse.jgit/META-INF/MANIFEST.MF | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSerializer.java | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters new file mode 100644 index 0000000000..3d36b880ea --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit" version="2"> + <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 --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 3e49a0462d..31c0bcba96 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 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 26a0a28d07..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,7 +108,7 @@ public class ObjectIdSerializer { * the object id to serialize; never null * @throws IOException * the stream writing failed - * @since 5.0 + * @since 4.11 */ public static void writeWithoutMarker(OutputStream out, @NonNull AnyObjectId id) throws IOException { @@ -148,7 +148,7 @@ public class ObjectIdSerializer { * @return the object id; never null * @throws IOException * there was an error reading the stream - * @since 5.0 + * @since 4.11 */ @NonNull public static ObjectId readWithoutMarker(InputStream in) throws IOException { |