diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-06-25 00:10:05 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-06-25 00:10:28 +0200 |
| commit | 93612d4f8ec0421cf9e0e6cc29380cc190512478 (patch) | |
| tree | e705d8455b9df893b33bec0abb4d16c8473d077b | |
| parent | 9719ca411eed75d30f3199d1d57663c3cb68e29b (diff) | |
| parent | f2bfaca08484b5547448640a01bf69f4f1176b17 (diff) | |
| download | jgit-93612d4f8ec0421cf9e0e6cc29380cc190512478.tar.gz jgit-93612d4f8ec0421cf9e0e6cc29380cc190512478.zip | |
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>
| -rw-r--r-- | org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 3 | ||||
| -rwxr-xr-x | tools/maven-central/deploy.rb | 2 | ||||
| -rwxr-xr-x | tools/maven-central/download.rb | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index d2748e3f5d..82ce42a960 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -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)", diff --git a/tools/maven-central/deploy.rb b/tools/maven-central/deploy.rb index 7cab32236b..834fa94995 100755 --- a/tools/maven-central/deploy.rb +++ b/tools/maven-central/deploy.rb @@ -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}", diff --git a/tools/maven-central/download.rb b/tools/maven-central/download.rb index 543ae87a5d..bc48c82195 100755 --- a/tools/maven-central/download.rb +++ b/tools/maven-central/download.rb @@ -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' |