Merge branch 'stable-5.8'

* 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>
This commit is contained in:
Matthias Sohn 2020-06-25 00:10:05 +02:00
commit 93612d4f8e
3 changed files with 5 additions and 2 deletions

View File

@ -8,8 +8,7 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
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)",

View File

@ -51,6 +51,7 @@ group = 'org.eclipse.jgit'
artifacts = [group,
group + '.ant',
group + '.archive',
group + '.gpg.bc',
group + '.http.apache',
group + '.http.server',
group + '.junit',
@ -60,6 +61,7 @@ artifacts = [group,
group + '.lfs.server',
group + '.pgm',
group + '.ssh.apache',
group + '.ssh.jsch',
group + '.ui']
prefix = ["mvn", "gpg:sign-and-deploy-file", "-Dgpg.passphrase=#{passphrase}",

View File

@ -11,6 +11,7 @@ group = 'org.eclipse.jgit'
artifacts = [group,
group + '.ant',
group + '.archive',
group + '.gpg.bc',
group + '.http.apache',
group + '.http.server',
group + '.junit',
@ -20,6 +21,7 @@ artifacts = [group,
group + '.lfs.server',
group + '.pgm',
group + '.ssh.apache',
group + '.ssh.jsch',
group + '.ui']
puts 'Deleting current files'