Skip to content

Commit 011f66d

Browse files
tomaswolfmsohn
authored andcommitted
Bump minimum dependency for Bouncy Castle to 1.80.0
Add an extra dependency in o.e.j.ssh.apache to ensure BC 1.80.0 gets pulled in if the bundle is installed. Bug: jgit-148 Change-Id: I13c3365440bedb73251760bcf77907081e8ba1cf
1 parent 776ec5f commit 011f66d

File tree

5 files changed

+34
-24
lines changed

5 files changed

+34
-24
lines changed

lib/BUILD

+5
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ java_library(
198198
visibility = [
199199
"//org.eclipse.jgit.gpg.bc:__pkg__",
200200
"//org.eclipse.jgit.gpg.bc.test:__pkg__",
201+
"//org.eclipse.jgit.ssh.apache:__pkg__",
202+
"//org.eclipse.jgit.ssh.apache.test:__pkg__",
201203
"//org.eclipse.jgit.test:__pkg__",
202204
],
203205
exports = ["@bcpg//jar"],
@@ -208,6 +210,7 @@ java_library(
208210
visibility = [
209211
"//org.eclipse.jgit.gpg.bc:__pkg__",
210212
"//org.eclipse.jgit.gpg.bc.test:__pkg__",
213+
"//org.eclipse.jgit.ssh.apache:__pkg__",
211214
"//org.eclipse.jgit.ssh.apache.test:__pkg__",
212215
"//org.eclipse.jgit.ssh.jsch.test:__pkg__",
213216
"//org.eclipse.jgit.test:__pkg__",
@@ -220,6 +223,7 @@ java_library(
220223
visibility = [
221224
"//org.eclipse.jgit.gpg.bc:__pkg__",
222225
"//org.eclipse.jgit.gpg.bc.test:__pkg__",
226+
"//org.eclipse.jgit.ssh.apache:__pkg__",
223227
"//org.eclipse.jgit.ssh.apache.test:__pkg__",
224228
"//org.eclipse.jgit.ssh.jsch.test:__pkg__",
225229
"//org.eclipse.jgit.test:__pkg__",
@@ -231,6 +235,7 @@ java_library(
231235
name = "bcpkix",
232236
visibility = [
233237
"//org.eclipse.jgit.gpg.bc:__pkg__",
238+
"//org.eclipse.jgit.ssh.apache:__pkg__",
234239
"//org.eclipse.jgit.ssh.apache.test:__pkg__",
235240
"//org.eclipse.jgit.ssh.jsch.test:__pkg__",
236241
"//org.eclipse.jgit.test:__pkg__",

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Bundle-Vendor: %Bundle-Vendor
88
Bundle-Localization: plugin
99
Bundle-RequiredExecutionEnvironment: JavaSE-17
1010
Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
11-
Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.79.0,2.0.0)",
12-
org.bouncycastle.jce.provider;version="[1.79.0,2.0.0)",
13-
org.bouncycastle.openpgp;version="[1.79.0,2.0.0)",
14-
org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)",
15-
org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)",
16-
org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)",
11+
Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.80.0,2.0.0)",
12+
org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)",
13+
org.bouncycastle.openpgp;version="[1.80.0,2.0.0)",
14+
org.bouncycastle.openpgp.operator;version="[1.80.0,2.0.0)",
15+
org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)",
16+
org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)",
1717
org.eclipse.jgit.gpg.bc.internal;version="[7.3.0,7.4.0)",
1818
org.eclipse.jgit.gpg.bc.internal.keys;version="[7.3.0,7.4.0)",
1919
org.eclipse.jgit.util.sha1;version="[7.3.0,7.4.0)",

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ Bundle-Vendor: %Bundle-Vendor
88
Bundle-Localization: OSGI-INF/l10n/gpg_bc
99
Bundle-Version: 7.3.0.qualifier
1010
Bundle-RequiredExecutionEnvironment: JavaSE-17
11-
Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)",
12-
org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)",
13-
org.bouncycastle.bcpg;version="[1.79.0,2.0.0)",
14-
org.bouncycastle.bcpg.sig;version="[1.79.0,2.0.0)",
15-
org.bouncycastle.crypto.ec;version="[1.79.0,2.0.0)",
16-
org.bouncycastle.gpg;version="[1.79.0,2.0.0)",
17-
org.bouncycastle.gpg.keybox;version="[1.79.0,2.0.0)",
18-
org.bouncycastle.gpg.keybox.jcajce;version="[1.79.0,2.0.0)",
19-
org.bouncycastle.jcajce.interfaces;version="[1.79.0,2.0.0)",
20-
org.bouncycastle.jcajce.util;version="[1.79.0,2.0.0)",
21-
org.bouncycastle.math.ec;version="[1.79.0,2.0.0)",
22-
org.bouncycastle.math.field;version="[1.79.0,2.0.0)",
23-
org.bouncycastle.openpgp;version="[1.79.0,2.0.0)",
24-
org.bouncycastle.openpgp.jcajce;version="[1.79.0,2.0.0)",
25-
org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)",
26-
org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)",
27-
org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)",
11+
Import-Package: org.bouncycastle.asn1;version="[1.80.0,2.0.0)",
12+
org.bouncycastle.asn1.x9;version="[1.80.0,2.0.0)",
13+
org.bouncycastle.bcpg;version="[1.80.0,2.0.0)",
14+
org.bouncycastle.bcpg.sig;version="[1.80.0,2.0.0)",
15+
org.bouncycastle.crypto.ec;version="[1.80.0,2.0.0)",
16+
org.bouncycastle.gpg;version="[1.80.0,2.0.0)",
17+
org.bouncycastle.gpg.keybox;version="[1.80.0,2.0.0)",
18+
org.bouncycastle.gpg.keybox.jcajce;version="[1.80.0,2.0.0)",
19+
org.bouncycastle.jcajce.interfaces;version="[1.80.0,2.0.0)",
20+
org.bouncycastle.jcajce.util;version="[1.80.0,2.0.0)",
21+
org.bouncycastle.math.ec;version="[1.80.0,2.0.0)",
22+
org.bouncycastle.math.field;version="[1.80.0,2.0.0)",
23+
org.bouncycastle.openpgp;version="[1.80.0,2.0.0)",
24+
org.bouncycastle.openpgp.jcajce;version="[1.80.0,2.0.0)",
25+
org.bouncycastle.openpgp.operator;version="[1.80.0,2.0.0)",
26+
org.bouncycastle.openpgp.operator.jcajce;version="[1.80.0,2.0.0)",
27+
org.bouncycastle.util.encoders;version="[1.80.0,2.0.0)",
2828
org.slf4j;version="[1.7.0,3.0.0)"
2929
Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
3030
org.eclipse.jgit.gpg.bc.internal.keys;version="7.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test"

org.eclipse.jgit.ssh.apache/BUILD

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ java_library(
1212
resource_strip_prefix = "org.eclipse.jgit.ssh.apache/resources",
1313
resources = RESOURCES,
1414
deps = [
15+
"//lib:bcpg",
16+
"//lib:bcpkix",
17+
"//lib:bcprov",
18+
"//lib:bcutil",
1519
"//lib:slf4j-api",
1620
"//lib:sshd-osgi",
1721
"//lib:sshd-sftp",

org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.3.0";x-friends:
3737
org.apache.sshd.client.session,
3838
org.apache.sshd.client.keyverifier",
3939
org.eclipse.jgit.transport.sshd.agent;version="7.3.0"
40-
Import-Package: org.apache.sshd.agent;version="[2.15.0,2.16.0)",
40+
Import-Package: org.bouncycastle.jce.provider;version="[1.80.0,2.0.0)",
41+
org.apache.sshd.agent;version="[2.15.0,2.16.0)",
4142
org.apache.sshd.client;version="[2.15.0,2.16.0)",
4243
org.apache.sshd.client.auth;version="[2.15.0,2.16.0)",
4344
org.apache.sshd.client.auth.keyboard;version="[2.15.0,2.16.0)",

0 commit comments

Comments
 (0)