]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.8' 46/165446/1
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 24 Jun 2020 22:10:05 +0000 (00:10 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 24 Jun 2020 22:10:28 +0000 (00:10 +0200)
* stable-5.8:
  Add new osgi fragments to maven-central deploy scripts
  Do not require org.assertj.core.annotations

Change-Id: I338065e7d2bf95b59a13d09cff7aea0c7689fe42
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF

index d2748e3f5d74c4d16b31798c532fbee661fcbe29,45ad204c7f0f3862d7ff56325ec998210bd11520..82ce42a960feb6ce09a78315b6f4d4054b7e6967
@@@ -3,13 -3,12 +3,12 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.gpg.bc
  Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
 -Fragment-Host: org.eclipse.jgit;bundle-version="[5.8.1,5.9.0)"
 +Fragment-Host: org.eclipse.jgit;bundle-version="[5.9.0,5.10.0)"
  Bundle-Vendor: %Bundle-Vendor
  Bundle-Localization: plugin
 -Bundle-Version: 5.8.1.qualifier
 +Bundle-Version: 5.9.0.qualifier
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
- Import-Package: org.assertj.core.annotations;version="3.14.0",
-  org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
+ Import-Package: org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
   org.bouncycastle.gpg;version="[1.65.0,2.0.0)",
   org.bouncycastle.gpg.keybox;version="[1.65.0,2.0.0)",
   org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)",