motiejus
/
jgit
1
Fork 0
Code Releases Activity

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>
This commit is contained in:
Matthias Sohn 2018-03-27 00:51:05 +02:00 committed by Jonathan Nieder
parent 4bfc6c2ae9 a263bb1173
commit 10d03a77a4
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.eclipse.jgit/.settings/.api_filters Normal file
View File

@ -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>

1
org.eclipse.jgit/META-INF/MANIFEST.MF
View File

@ -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

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectIdSerializer.java
View File

@ -108,7 +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 5.0
* @since 4.11
*/
public static void writeWithoutMarker(OutputStream out, @NonNull AnyObjectId id)
throws IOException {
@ -148,7 +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 5.0
* @since 4.11
*/
@NonNull
public static ObjectId readWithoutMarker(InputStream in) throws IOException {