summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/META-INF
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-07-06 10:38:30 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2022-07-06 16:59:30 +0200
commit9f7d77b608c384669811772760591329890f19b7 (patch)
tree525403e7994fd3da0e87009f7d7330d0b8f6d9e2 /org.eclipse.jgit/META-INF
parentd961bb65024815996d82094cacaba811bf5eab85 (diff)
parent035e0e23f251fdb766a6630509bcf342efb8b3ad (diff)
downloadjgit-9f7d77b608c384669811772760591329890f19b7.tar.gz
jgit-9f7d77b608c384669811772760591329890f19b7.zip
Merge branch 'stable-5.13' into stable-6.0
* stable-5.13: UploadPack: don't prematurely terminate timer in case of error Do not create reflog for remote tracking branches during clone UploadPack: do not check reachability of visible SHA1s Add missing package import javax.management to org.eclipse.jgit Change-Id: I6db0a4d74399fde892eeec62efd2946f97547a5d
Diffstat (limited to 'org.eclipse.jgit/META-INF')
-rw-r--r--org.eclipse.jgit/META-INF/MANIFEST.MF1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF
index e9bb78daa8..87b58e1fc5 100644
--- a/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@ -221,6 +221,7 @@ Export-Package: org.eclipse.jgit.annotations;version="6.0.1",
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)",
javax.crypto,
+ javax.management,
javax.net.ssl,
org.slf4j;version="[1.7.0,2.0.0)",
org.xml.sax,