diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2022-07-06 17:01:03 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-07-06 17:02:04 +0200 |
commit | 34600e3ca23262ed67555d147fa46892b5a5e67b (patch) | |
tree | d1c4362d9df0bf05a27ea7918cfea7da5a58b9c4 /org.eclipse.jgit/META-INF | |
parent | 58f5302e1d8c1c7a4111c141bea0533c41129a74 (diff) | |
parent | d01376106af8800017ac3c08d7c7ac1fd5ccc9ee (diff) | |
download | jgit-34600e3ca23262ed67555d147fa46892b5a5e67b.tar.gz jgit-34600e3ca23262ed67555d147fa46892b5a5e67b.zip |
Merge branch 'stable-6.1' into stable-6.2
* stable-6.1:
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: Ib3ff6a038e1b92a931a7f2624c19bbefd8cb95fd
Diffstat (limited to 'org.eclipse.jgit/META-INF')
-rw-r--r-- | org.eclipse.jgit/META-INF/MANIFEST.MF | 1 |
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 39655e46a3..1b34912915 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -228,6 +228,7 @@ Export-Package: org.eclipse.jgit.annotations;version="6.2.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, |