Browse Source

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>
master
Matthias Sohn 4 years ago
parent
commit
93612d4f8e
  1. 3
      org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
  2. 2
      tools/maven-central/deploy.rb
  3. 2
      tools/maven-central/download.rb

3
org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF

@ -8,8 +8,7 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin Bundle-Localization: plugin
Bundle-Version: 5.9.0.qualifier Bundle-Version: 5.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.assertj.core.annotations;version="3.14.0", Import-Package: org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
org.bouncycastle.bcpg;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg;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;version="[1.65.0,2.0.0)",
org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.gpg.keybox.jcajce;version="[1.65.0,2.0.0)",

2
tools/maven-central/deploy.rb

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

2
tools/maven-central/download.rb

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

Loading…
Cancel
Save