Skip to content

Commit 4c82d98

Browse files
msohnmsohn
committed
Merge branch 'master' into stable-7.7
* master: RefDirectory#refreshPathToLooseRef: also refresh loose ref itself ReceivePack: Add missing @SInCE tag for new API method TreeWalkConnectivityChecker: Support non-commit objects in refs ReceivePack: make getClientShallowCommits protected DfsObjDatabase: Make createDfsPackFile public DfsPackCompactor: add a pre-commit hook to plug midx calculation Update bouncycastle to 1.84 [ssh] Reject host certificates if the certified key is revoked Add new TreeWalkConnectivityChecker Make the PackParser.needNewObjectIds method public orbit: update org.apache.ant to 1.10.17.v20260410-1000 MidxMetadataReader: add private constructor and adjust method visibility MidxWriter: Write to tmp files and use atomic rename to commit Instrument ReceivePack to track time spent in pre-receive hooks MidxWriter: Do not accept midx to build new midx PackDirectory: Integrate Multi-Pack Index (MIDX) support PackMidx: A Pack subclass that uses midx Change-Id: I5fd4c34673abaecf0db805cfd9383a4feb5028f9
2 parents 8fe0ace + f23d73e commit 4c82d98

36 files changed

Lines changed: 3193 additions & 107 deletions

File tree

‎MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ git_repository(
2323
remote = "https://gerrit.googlesource.com/bazlets",
2424
)
2525

26-
BOUNCYCASTLE_VERSION = "1.83"
26+
BOUNCYCASTLE_VERSION = "1.84"
2727

2828
BYTE_BUDDY_VERSION = "1.18.8"
2929

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

Lines changed: 6 additions & 6 deletions
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
Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git
11-
Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.83.0,2.0.0)",
12-
org.bouncycastle.jce.provider;version="[1.83.0,2.0.0)",
13-
org.bouncycastle.openpgp;version="[1.83.0,2.0.0)",
14-
org.bouncycastle.openpgp.operator;version="[1.83.0,2.0.0)",
15-
org.bouncycastle.openpgp.operator.jcajce;version="[1.83.0,2.0.0)",
16-
org.bouncycastle.util.encoders;version="[1.83.0,2.0.0)",
11+
Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.84.0,2.0.0)",
12+
org.bouncycastle.jce.provider;version="[1.84.0,2.0.0)",
13+
org.bouncycastle.openpgp;version="[1.84.0,2.0.0)",
14+
org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)",
15+
org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)",
16+
org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)",
1717
org.eclipse.jgit.gpg.bc.internal;version="[7.7.0,7.8.0)",
1818
org.eclipse.jgit.gpg.bc.internal.keys;version="[7.7.0,7.8.0)",
1919
org.eclipse.jgit.util.sha1;version="[7.7.0,7.8.0)",

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ Bundle-Localization: OSGI-INF/l10n/gpg_bc
99
Bundle-Version: 7.7.0.qualifier
1010
Bundle-RequiredExecutionEnvironment: JavaSE-17
1111
Bundle-SCM: url=https://github.com/eclipse-jgit/jgit, connection=scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit.git, developerConnection=scm:git:https://eclipse.gerrithub.io/a/eclipse-jgit/jgit.git
12-
Import-Package: org.bouncycastle.asn1;version="[1.83.0,2.0.0)",
13-
org.bouncycastle.asn1.x9;version="[1.83.0,2.0.0)",
14-
org.bouncycastle.bcpg;version="[1.83.0,2.0.0)",
15-
org.bouncycastle.bcpg.sig;version="[1.83.0,2.0.0)",
16-
org.bouncycastle.crypto.ec;version="[1.83.0,2.0.0)",
17-
org.bouncycastle.gpg;version="[1.83.0,2.0.0)",
18-
org.bouncycastle.gpg.keybox;version="[1.83.0,2.0.0)",
19-
org.bouncycastle.gpg.keybox.jcajce;version="[1.83.0,2.0.0)",
20-
org.bouncycastle.jcajce.interfaces;version="[1.83.0,2.0.0)",
21-
org.bouncycastle.jcajce.util;version="[1.83.0,2.0.0)",
22-
org.bouncycastle.math.ec;version="[1.83.0,2.0.0)",
23-
org.bouncycastle.math.field;version="[1.83.0,2.0.0)",
24-
org.bouncycastle.openpgp;version="[1.83.0,2.0.0)",
25-
org.bouncycastle.openpgp.jcajce;version="[1.83.0,2.0.0)",
26-
org.bouncycastle.openpgp.operator;version="[1.83.0,2.0.0)",
27-
org.bouncycastle.openpgp.operator.jcajce;version="[1.83.0,2.0.0)",
28-
org.bouncycastle.util.encoders;version="[1.83.0,2.0.0)",
12+
Import-Package: org.bouncycastle.asn1;version="[1.84.0,2.0.0)",
13+
org.bouncycastle.asn1.x9;version="[1.84.0,2.0.0)",
14+
org.bouncycastle.bcpg;version="[1.84.0,2.0.0)",
15+
org.bouncycastle.bcpg.sig;version="[1.84.0,2.0.0)",
16+
org.bouncycastle.crypto.ec;version="[1.84.0,2.0.0)",
17+
org.bouncycastle.gpg;version="[1.84.0,2.0.0)",
18+
org.bouncycastle.gpg.keybox;version="[1.84.0,2.0.0)",
19+
org.bouncycastle.gpg.keybox.jcajce;version="[1.84.0,2.0.0)",
20+
org.bouncycastle.jcajce.interfaces;version="[1.84.0,2.0.0)",
21+
org.bouncycastle.jcajce.util;version="[1.84.0,2.0.0)",
22+
org.bouncycastle.math.ec;version="[1.84.0,2.0.0)",
23+
org.bouncycastle.math.field;version="[1.84.0,2.0.0)",
24+
org.bouncycastle.openpgp;version="[1.84.0,2.0.0)",
25+
org.bouncycastle.openpgp.jcajce;version="[1.84.0,2.0.0)",
26+
org.bouncycastle.openpgp.operator;version="[1.84.0,2.0.0)",
27+
org.bouncycastle.openpgp.operator.jcajce;version="[1.84.0,2.0.0)",
28+
org.bouncycastle.util.encoders;version="[1.84.0,2.0.0)",
2929
org.slf4j;version="[1.7.0,3.0.0)"
3030
Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
3131
org.eclipse.jgit.gpg.bc.internal.keys;version="7.7.0";x-friends:="org.eclipse.jgit.gpg.bc.test"

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.34" sequenceNumber="1775482489">
4+
<target name="jgit-4.34" sequenceNumber="1776265462">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -217,25 +217,25 @@
217217
<dependency>
218218
<groupId>org.bouncycastle</groupId>
219219
<artifactId>bcpg-jdk18on</artifactId>
220-
<version>1.83</version>
220+
<version>1.84</version>
221221
<type>jar</type>
222222
</dependency>
223223
<dependency>
224224
<groupId>org.bouncycastle</groupId>
225225
<artifactId>bcprov-jdk18on</artifactId>
226-
<version>1.83</version>
226+
<version>1.84</version>
227227
<type>jar</type>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.bouncycastle</groupId>
231231
<artifactId>bcpkix-jdk18on</artifactId>
232-
<version>1.83</version>
232+
<version>1.84</version>
233233
<type>jar</type>
234234
</dependency>
235235
<dependency>
236236
<groupId>org.bouncycastle</groupId>
237237
<artifactId>bcutil-jdk18on</artifactId>
238-
<version>1.83</version>
238+
<version>1.84</version>
239239
<type>jar</type>
240240
</dependency>
241241
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.35" sequenceNumber="1775482489">
4+
<target name="jgit-4.35" sequenceNumber="1776265462">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -217,25 +217,25 @@
217217
<dependency>
218218
<groupId>org.bouncycastle</groupId>
219219
<artifactId>bcpg-jdk18on</artifactId>
220-
<version>1.83</version>
220+
<version>1.84</version>
221221
<type>jar</type>
222222
</dependency>
223223
<dependency>
224224
<groupId>org.bouncycastle</groupId>
225225
<artifactId>bcprov-jdk18on</artifactId>
226-
<version>1.83</version>
226+
<version>1.84</version>
227227
<type>jar</type>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.bouncycastle</groupId>
231231
<artifactId>bcpkix-jdk18on</artifactId>
232-
<version>1.83</version>
232+
<version>1.84</version>
233233
<type>jar</type>
234234
</dependency>
235235
<dependency>
236236
<groupId>org.bouncycastle</groupId>
237237
<artifactId>bcutil-jdk18on</artifactId>
238-
<version>1.83</version>
238+
<version>1.84</version>
239239
<type>jar</type>
240240
</dependency>
241241
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.36" sequenceNumber="1775482489">
4+
<target name="jgit-4.36" sequenceNumber="1776265463">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -217,25 +217,25 @@
217217
<dependency>
218218
<groupId>org.bouncycastle</groupId>
219219
<artifactId>bcpg-jdk18on</artifactId>
220-
<version>1.83</version>
220+
<version>1.84</version>
221221
<type>jar</type>
222222
</dependency>
223223
<dependency>
224224
<groupId>org.bouncycastle</groupId>
225225
<artifactId>bcprov-jdk18on</artifactId>
226-
<version>1.83</version>
226+
<version>1.84</version>
227227
<type>jar</type>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.bouncycastle</groupId>
231231
<artifactId>bcpkix-jdk18on</artifactId>
232-
<version>1.83</version>
232+
<version>1.84</version>
233233
<type>jar</type>
234234
</dependency>
235235
<dependency>
236236
<groupId>org.bouncycastle</groupId>
237237
<artifactId>bcutil-jdk18on</artifactId>
238-
<version>1.83</version>
238+
<version>1.84</version>
239239
<type>jar</type>
240240
</dependency>
241241
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.37.target‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.37" sequenceNumber="1775482489">
4+
<target name="jgit-4.37" sequenceNumber="1776265462">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -217,25 +217,25 @@
217217
<dependency>
218218
<groupId>org.bouncycastle</groupId>
219219
<artifactId>bcpg-jdk18on</artifactId>
220-
<version>1.83</version>
220+
<version>1.84</version>
221221
<type>jar</type>
222222
</dependency>
223223
<dependency>
224224
<groupId>org.bouncycastle</groupId>
225225
<artifactId>bcprov-jdk18on</artifactId>
226-
<version>1.83</version>
226+
<version>1.84</version>
227227
<type>jar</type>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.bouncycastle</groupId>
231231
<artifactId>bcpkix-jdk18on</artifactId>
232-
<version>1.83</version>
232+
<version>1.84</version>
233233
<type>jar</type>
234234
</dependency>
235235
<dependency>
236236
<groupId>org.bouncycastle</groupId>
237237
<artifactId>bcutil-jdk18on</artifactId>
238-
<version>1.83</version>
238+
<version>1.84</version>
239239
<type>jar</type>
240240
</dependency>
241241
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.38.target‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.38" sequenceNumber="1775482489">
4+
<target name="jgit-4.38" sequenceNumber="1776265464">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -217,25 +217,25 @@
217217
<dependency>
218218
<groupId>org.bouncycastle</groupId>
219219
<artifactId>bcpg-jdk18on</artifactId>
220-
<version>1.83</version>
220+
<version>1.84</version>
221221
<type>jar</type>
222222
</dependency>
223223
<dependency>
224224
<groupId>org.bouncycastle</groupId>
225225
<artifactId>bcprov-jdk18on</artifactId>
226-
<version>1.83</version>
226+
<version>1.84</version>
227227
<type>jar</type>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.bouncycastle</groupId>
231231
<artifactId>bcpkix-jdk18on</artifactId>
232-
<version>1.83</version>
232+
<version>1.84</version>
233233
<type>jar</type>
234234
</dependency>
235235
<dependency>
236236
<groupId>org.bouncycastle</groupId>
237237
<artifactId>bcutil-jdk18on</artifactId>
238-
<version>1.83</version>
238+
<version>1.84</version>
239239
<type>jar</type>
240240
</dependency>
241241
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.39.target‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.39" sequenceNumber="1775482489">
4+
<target name="jgit-4.39" sequenceNumber="1776265464">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@@ -217,25 +217,25 @@
217217
<dependency>
218218
<groupId>org.bouncycastle</groupId>
219219
<artifactId>bcpg-jdk18on</artifactId>
220-
<version>1.83</version>
220+
<version>1.84</version>
221221
<type>jar</type>
222222
</dependency>
223223
<dependency>
224224
<groupId>org.bouncycastle</groupId>
225225
<artifactId>bcprov-jdk18on</artifactId>
226-
<version>1.83</version>
226+
<version>1.84</version>
227227
<type>jar</type>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.bouncycastle</groupId>
231231
<artifactId>bcpkix-jdk18on</artifactId>
232-
<version>1.83</version>
232+
<version>1.84</version>
233233
<type>jar</type>
234234
</dependency>
235235
<dependency>
236236
<groupId>org.bouncycastle</groupId>
237237
<artifactId>bcutil-jdk18on</artifactId>
238-
<version>1.83</version>
238+
<version>1.84</version>
239239
<type>jar</type>
240240
</dependency>
241241
</dependencies>

‎org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.40.target‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="jgit-4.40" sequenceNumber="1775482489">
4+
<target name="jgit-4.40" sequenceNumber="1776265463">
55
<locations>
66
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
77
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
88
<unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
99
<unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
1010
<unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
11-
<unit id="org.apache.ant" version="1.10.15.v20240901-1000"/>
12-
<unit id="org.apache.ant.source" version="1.10.15.v20240901-1000"/>
11+
<unit id="org.apache.ant" version="1.10.17.v20260410-1000"/>
12+
<unit id="org.apache.ant.source" version="1.10.17.v20260410-1000"/>
1313
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
1414
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
1515
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
@@ -217,25 +217,25 @@
217217
<dependency>
218218
<groupId>org.bouncycastle</groupId>
219219
<artifactId>bcpg-jdk18on</artifactId>
220-
<version>1.83</version>
220+
<version>1.84</version>
221221
<type>jar</type>
222222
</dependency>
223223
<dependency>
224224
<groupId>org.bouncycastle</groupId>
225225
<artifactId>bcprov-jdk18on</artifactId>
226-
<version>1.83</version>
226+
<version>1.84</version>
227227
<type>jar</type>
228228
</dependency>
229229
<dependency>
230230
<groupId>org.bouncycastle</groupId>
231231
<artifactId>bcpkix-jdk18on</artifactId>
232-
<version>1.83</version>
232+
<version>1.84</version>
233233
<type>jar</type>
234234
</dependency>
235235
<dependency>
236236
<groupId>org.bouncycastle</groupId>
237237
<artifactId>bcutil-jdk18on</artifactId>
238-
<version>1.83</version>
238+
<version>1.84</version>
239239
<type>jar</type>
240240
</dependency>
241241
</dependencies>

0 commit comments

Comments
 (0)