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 /org.eclipse.jgit/META-INF | |
| 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>
Diffstat (limited to 'org.eclipse.jgit/META-INF')
| -rw-r--r-- | org.eclipse.jgit/META-INF/MANIFEST.MF | 1 |
1 files changed, 0 insertions, 1 deletions
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 |