Skip to content

Commit 99c85eb

Browse files
msohnmsohn
committed
Merge branch 'master' into stable-7.6
* master: Support diff3 conflict style in merges RebaseCommand: Honor the commit message cleanup configuration Remove the option to create 'blank issues' in GitHub Refactor handlePackError method to improve readability PackIndexMerger: Accept a midx as input to build another midx DfsPackFileMidxNPacks: Use only the list of packs in midx order DfsMidxWriterTest: Rename to DfsMidxWriterBitmapsTest Update jetty to 12.1.6 Update bytebuddy to 1.18.5 Update commons-codec to 1.21.0 Orbit: update org.objenesis to 3.5.0 DfsMidxWriter: Pass the PackIndexMerger instead of a Map of sources MidxIterators join: compare shifted packId DfsPackFileMidx: Offer localIterator PackIndexMerger: replace constructor with Builder Do not log packfiles moved away or pruned Change-Id: Icb08a47ecc87914ebc6ac25e84f6b2cfd35ae62b
2 parents 8450ee5 + d4ceb3f commit 99c85eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+907
-308
lines changed

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎MODULE.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ git_repository(
2323

2424
BOUNCYCASTLE_VERSION = "1.83"
2525

26-
BYTE_BUDDY_VERSION = "1.18.4"
26+
BYTE_BUDDY_VERSION = "1.18.5"
2727

28-
JETTY_VERSION = "12.1.5"
28+
JETTY_VERSION = "12.1.6"
2929

3030
JMH_VERSION = "1.37"
3131

@@ -45,7 +45,7 @@ maven.install(
4545
"com.googlecode.javaewah:JavaEWAH:1.2.3",
4646
"com.jcraft:jsch:0.1.55",
4747
"com.jcraft:jzlib:1.1.3",
48-
"commons-codec:commons-codec:1.20.0",
48+
"commons-codec:commons-codec:1.21.0",
4949
"commons-io:commons-io:2.21.0",
5050
"commons-logging:commons-logging:1.3.5",
5151
"jakarta.servlet:jakarta.servlet-api:6.1.0",

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

Lines changed: 12 additions & 12 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="1769597966">
4+
<target name="jgit-4.34" sequenceNumber="1771451400">
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"/>
@@ -107,49 +107,49 @@
107107
<dependency>
108108
<groupId>org.eclipse.jetty.ee10</groupId>
109109
<artifactId>jetty-ee10-servlet</artifactId>
110-
<version>12.1.5</version>
110+
<version>12.1.6</version>
111111
<type>jar</type>
112112
</dependency>
113113
<dependency>
114114
<groupId>org.eclipse.jetty</groupId>
115115
<artifactId>jetty-http</artifactId>
116-
<version>12.1.5</version>
116+
<version>12.1.6</version>
117117
<type>jar</type>
118118
</dependency>
119119
<dependency>
120120
<groupId>org.eclipse.jetty</groupId>
121121
<artifactId>jetty-io</artifactId>
122-
<version>12.1.5</version>
122+
<version>12.1.6</version>
123123
<type>jar</type>
124124
</dependency>
125125
<dependency>
126126
<groupId>org.eclipse.jetty</groupId>
127127
<artifactId>jetty-security</artifactId>
128-
<version>12.1.5</version>
128+
<version>12.1.6</version>
129129
<type>jar</type>
130130
</dependency>
131131
<dependency>
132132
<groupId>org.eclipse.jetty</groupId>
133133
<artifactId>jetty-server</artifactId>
134-
<version>12.1.5</version>
134+
<version>12.1.6</version>
135135
<type>jar</type>
136136
</dependency>
137137
<dependency>
138138
<groupId>org.eclipse.jetty</groupId>
139139
<artifactId>jetty-session</artifactId>
140-
<version>12.1.5</version>
140+
<version>12.1.6</version>
141141
<type>jar</type>
142142
</dependency>
143143
<dependency>
144144
<groupId>org.eclipse.jetty</groupId>
145145
<artifactId>jetty-util</artifactId>
146-
<version>12.1.5</version>
146+
<version>12.1.6</version>
147147
<type>jar</type>
148148
</dependency>
149149
<dependency>
150150
<groupId>org.eclipse.jetty</groupId>
151151
<artifactId>jetty-util-ajax</artifactId>
152-
<version>12.1.5</version>
152+
<version>12.1.6</version>
153153
<type>jar</type>
154154
</dependency>
155155
<dependency>
@@ -195,13 +195,13 @@
195195
<dependency>
196196
<groupId>net.bytebuddy</groupId>
197197
<artifactId>byte-buddy</artifactId>
198-
<version>1.18.4</version>
198+
<version>1.18.5</version>
199199
<type>jar</type>
200200
</dependency>
201201
<dependency>
202202
<groupId>net.bytebuddy</groupId>
203203
<artifactId>byte-buddy-agent</artifactId>
204-
<version>1.18.4</version>
204+
<version>1.18.5</version>
205205
<type>jar</type>
206206
</dependency>
207207
</dependencies>
@@ -259,7 +259,7 @@
259259
<dependency>
260260
<groupId>commons-codec</groupId>
261261
<artifactId>commons-codec</artifactId>
262-
<version>1.20.0</version>
262+
<version>1.21.0</version>
263263
<type>jar</type>
264264
</dependency>
265265
<dependency>

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

Lines changed: 12 additions & 12 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="1769597966">
4+
<target name="jgit-4.35" sequenceNumber="1771451400">
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"/>
@@ -107,49 +107,49 @@
107107
<dependency>
108108
<groupId>org.eclipse.jetty.ee10</groupId>
109109
<artifactId>jetty-ee10-servlet</artifactId>
110-
<version>12.1.5</version>
110+
<version>12.1.6</version>
111111
<type>jar</type>
112112
</dependency>
113113
<dependency>
114114
<groupId>org.eclipse.jetty</groupId>
115115
<artifactId>jetty-http</artifactId>
116-
<version>12.1.5</version>
116+
<version>12.1.6</version>
117117
<type>jar</type>
118118
</dependency>
119119
<dependency>
120120
<groupId>org.eclipse.jetty</groupId>
121121
<artifactId>jetty-io</artifactId>
122-
<version>12.1.5</version>
122+
<version>12.1.6</version>
123123
<type>jar</type>
124124
</dependency>
125125
<dependency>
126126
<groupId>org.eclipse.jetty</groupId>
127127
<artifactId>jetty-security</artifactId>
128-
<version>12.1.5</version>
128+
<version>12.1.6</version>
129129
<type>jar</type>
130130
</dependency>
131131
<dependency>
132132
<groupId>org.eclipse.jetty</groupId>
133133
<artifactId>jetty-server</artifactId>
134-
<version>12.1.5</version>
134+
<version>12.1.6</version>
135135
<type>jar</type>
136136
</dependency>
137137
<dependency>
138138
<groupId>org.eclipse.jetty</groupId>
139139
<artifactId>jetty-session</artifactId>
140-
<version>12.1.5</version>
140+
<version>12.1.6</version>
141141
<type>jar</type>
142142
</dependency>
143143
<dependency>
144144
<groupId>org.eclipse.jetty</groupId>
145145
<artifactId>jetty-util</artifactId>
146-
<version>12.1.5</version>
146+
<version>12.1.6</version>
147147
<type>jar</type>
148148
</dependency>
149149
<dependency>
150150
<groupId>org.eclipse.jetty</groupId>
151151
<artifactId>jetty-util-ajax</artifactId>
152-
<version>12.1.5</version>
152+
<version>12.1.6</version>
153153
<type>jar</type>
154154
</dependency>
155155
<dependency>
@@ -195,13 +195,13 @@
195195
<dependency>
196196
<groupId>net.bytebuddy</groupId>
197197
<artifactId>byte-buddy</artifactId>
198-
<version>1.18.4</version>
198+
<version>1.18.5</version>
199199
<type>jar</type>
200200
</dependency>
201201
<dependency>
202202
<groupId>net.bytebuddy</groupId>
203203
<artifactId>byte-buddy-agent</artifactId>
204-
<version>1.18.4</version>
204+
<version>1.18.5</version>
205205
<type>jar</type>
206206
</dependency>
207207
</dependencies>
@@ -259,7 +259,7 @@
259259
<dependency>
260260
<groupId>commons-codec</groupId>
261261
<artifactId>commons-codec</artifactId>
262-
<version>1.20.0</version>
262+
<version>1.21.0</version>
263263
<type>jar</type>
264264
</dependency>
265265
<dependency>

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

Lines changed: 12 additions & 12 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="1769597965">
4+
<target name="jgit-4.36" sequenceNumber="1771451400">
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"/>
@@ -107,49 +107,49 @@
107107
<dependency>
108108
<groupId>org.eclipse.jetty.ee10</groupId>
109109
<artifactId>jetty-ee10-servlet</artifactId>
110-
<version>12.1.5</version>
110+
<version>12.1.6</version>
111111
<type>jar</type>
112112
</dependency>
113113
<dependency>
114114
<groupId>org.eclipse.jetty</groupId>
115115
<artifactId>jetty-http</artifactId>
116-
<version>12.1.5</version>
116+
<version>12.1.6</version>
117117
<type>jar</type>
118118
</dependency>
119119
<dependency>
120120
<groupId>org.eclipse.jetty</groupId>
121121
<artifactId>jetty-io</artifactId>
122-
<version>12.1.5</version>
122+
<version>12.1.6</version>
123123
<type>jar</type>
124124
</dependency>
125125
<dependency>
126126
<groupId>org.eclipse.jetty</groupId>
127127
<artifactId>jetty-security</artifactId>
128-
<version>12.1.5</version>
128+
<version>12.1.6</version>
129129
<type>jar</type>
130130
</dependency>
131131
<dependency>
132132
<groupId>org.eclipse.jetty</groupId>
133133
<artifactId>jetty-server</artifactId>
134-
<version>12.1.5</version>
134+
<version>12.1.6</version>
135135
<type>jar</type>
136136
</dependency>
137137
<dependency>
138138
<groupId>org.eclipse.jetty</groupId>
139139
<artifactId>jetty-session</artifactId>
140-
<version>12.1.5</version>
140+
<version>12.1.6</version>
141141
<type>jar</type>
142142
</dependency>
143143
<dependency>
144144
<groupId>org.eclipse.jetty</groupId>
145145
<artifactId>jetty-util</artifactId>
146-
<version>12.1.5</version>
146+
<version>12.1.6</version>
147147
<type>jar</type>
148148
</dependency>
149149
<dependency>
150150
<groupId>org.eclipse.jetty</groupId>
151151
<artifactId>jetty-util-ajax</artifactId>
152-
<version>12.1.5</version>
152+
<version>12.1.6</version>
153153
<type>jar</type>
154154
</dependency>
155155
<dependency>
@@ -195,13 +195,13 @@
195195
<dependency>
196196
<groupId>net.bytebuddy</groupId>
197197
<artifactId>byte-buddy</artifactId>
198-
<version>1.18.4</version>
198+
<version>1.18.5</version>
199199
<type>jar</type>
200200
</dependency>
201201
<dependency>
202202
<groupId>net.bytebuddy</groupId>
203203
<artifactId>byte-buddy-agent</artifactId>
204-
<version>1.18.4</version>
204+
<version>1.18.5</version>
205205
<type>jar</type>
206206
</dependency>
207207
</dependencies>
@@ -259,7 +259,7 @@
259259
<dependency>
260260
<groupId>commons-codec</groupId>
261261
<artifactId>commons-codec</artifactId>
262-
<version>1.20.0</version>
262+
<version>1.21.0</version>
263263
<type>jar</type>
264264
</dependency>
265265
<dependency>

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

Lines changed: 12 additions & 12 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="1769597966">
4+
<target name="jgit-4.37" sequenceNumber="1771451400">
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"/>
@@ -107,49 +107,49 @@
107107
<dependency>
108108
<groupId>org.eclipse.jetty.ee10</groupId>
109109
<artifactId>jetty-ee10-servlet</artifactId>
110-
<version>12.1.5</version>
110+
<version>12.1.6</version>
111111
<type>jar</type>
112112
</dependency>
113113
<dependency>
114114
<groupId>org.eclipse.jetty</groupId>
115115
<artifactId>jetty-http</artifactId>
116-
<version>12.1.5</version>
116+
<version>12.1.6</version>
117117
<type>jar</type>
118118
</dependency>
119119
<dependency>
120120
<groupId>org.eclipse.jetty</groupId>
121121
<artifactId>jetty-io</artifactId>
122-
<version>12.1.5</version>
122+
<version>12.1.6</version>
123123
<type>jar</type>
124124
</dependency>
125125
<dependency>
126126
<groupId>org.eclipse.jetty</groupId>
127127
<artifactId>jetty-security</artifactId>
128-
<version>12.1.5</version>
128+
<version>12.1.6</version>
129129
<type>jar</type>
130130
</dependency>
131131
<dependency>
132132
<groupId>org.eclipse.jetty</groupId>
133133
<artifactId>jetty-server</artifactId>
134-
<version>12.1.5</version>
134+
<version>12.1.6</version>
135135
<type>jar</type>
136136
</dependency>
137137
<dependency>
138138
<groupId>org.eclipse.jetty</groupId>
139139
<artifactId>jetty-session</artifactId>
140-
<version>12.1.5</version>
140+
<version>12.1.6</version>
141141
<type>jar</type>
142142
</dependency>
143143
<dependency>
144144
<groupId>org.eclipse.jetty</groupId>
145145
<artifactId>jetty-util</artifactId>
146-
<version>12.1.5</version>
146+
<version>12.1.6</version>
147147
<type>jar</type>
148148
</dependency>
149149
<dependency>
150150
<groupId>org.eclipse.jetty</groupId>
151151
<artifactId>jetty-util-ajax</artifactId>
152-
<version>12.1.5</version>
152+
<version>12.1.6</version>
153153
<type>jar</type>
154154
</dependency>
155155
<dependency>
@@ -195,13 +195,13 @@
195195
<dependency>
196196
<groupId>net.bytebuddy</groupId>
197197
<artifactId>byte-buddy</artifactId>
198-
<version>1.18.4</version>
198+
<version>1.18.5</version>
199199
<type>jar</type>
200200
</dependency>
201201
<dependency>
202202
<groupId>net.bytebuddy</groupId>
203203
<artifactId>byte-buddy-agent</artifactId>
204-
<version>1.18.4</version>
204+
<version>1.18.5</version>
205205
<type>jar</type>
206206
</dependency>
207207
</dependencies>
@@ -259,7 +259,7 @@
259259
<dependency>
260260
<groupId>commons-codec</groupId>
261261
<artifactId>commons-codec</artifactId>
262-
<version>1.20.0</version>
262+
<version>1.21.0</version>
263263
<type>jar</type>
264264
</dependency>
265265
<dependency>

0 commit comments

Comments
 (0)