Skip to content

Commit 1bab691

Browse files
authored
Merge branch 'git-commit-id:master' into per-module-versions
2 parents 698937a + e8cb476 commit 1bab691

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

.github/workflows/default-tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ jobs:
77
name: Run checkstyle
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v6
1111
with:
1212
submodules: recursive
1313
- name: Set up JDK 11
14-
uses: actions/setup-java@v4
14+
uses: actions/setup-java@v5
1515
with:
1616
distribution: 'zulu'
1717
java-version: 11
1818
java-package: jdk
1919
- name: Cache local Maven repository
20-
uses: actions/cache@v4
20+
uses: actions/cache@v5
2121
with:
2222
path: ~/.m2
2323
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -33,17 +33,17 @@ jobs:
3333
matrix:
3434
java_version: [ '11', '12', '13', '14', '15', '16', '17', '18', '19', '20' ]
3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v6
3737
with:
3838
submodules: recursive
3939
- name: Set up JDK ${{ matrix.java_version }}
40-
uses: actions/setup-java@v4
40+
uses: actions/setup-java@v5
4141
with:
4242
distribution: 'zulu'
4343
java-version: ${{ matrix.java_version }}
4444
java-package: jdk
4545
- name: Cache local Maven repository
46-
uses: actions/cache@v4
46+
uses: actions/cache@v5
4747
with:
4848
path: ~/.m2
4949
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -58,17 +58,17 @@ jobs:
5858
if: ${{ github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/') && github.ref == 'refs/heads/master' }}
5959

6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v6
6262
with:
6363
submodules: recursive
6464
- name: Set up JDK 11
65-
uses: actions/setup-java@v4
65+
uses: actions/setup-java@v5
6666
with:
6767
distribution: 'zulu'
6868
java-version: 11
6969
java-package: jdk
7070
- name: Cache local Maven repository
71-
uses: actions/cache@v4
71+
uses: actions/cache@v5
7272
with:
7373
path: ~/.m2
7474
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

pom.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
https://github.com/eclipse-jgit/jgit/issues/28
4545
https://github.com/eclipse-jgit/jgit/issues/36
4646
-->
47-
<jgit.version>6.10.0.202406032230-r</jgit.version>
47+
<jgit.version>6.10.1.202505221210-r</jgit.version>
4848
<junit.version>5.13.1</junit.version>
4949
<mockito.version>5.18.0</mockito.version>
50-
<assertj.version>3.27.3</assertj.version>
50+
<assertj.version>3.27.7</assertj.version>
5151
</properties>
5252

5353
<dependencyManagement>
@@ -67,12 +67,12 @@
6767
<plugin>
6868
<groupId>org.apache.maven.plugins</groupId>
6969
<artifactId>maven-antrun-plugin</artifactId>
70-
<version>3.1.0</version>
70+
<version>3.2.0</version>
7171
</plugin>
7272
<plugin>
7373
<groupId>org.apache.maven.plugins</groupId>
7474
<artifactId>maven-assembly-plugin</artifactId>
75-
<version>3.7.1</version>
75+
<version>3.8.0</version>
7676
</plugin>
7777
<plugin>
7878
<groupId>org.apache.maven.plugins</groupId>
@@ -82,25 +82,25 @@
8282
<plugin>
8383
<groupId>org.apache.maven.plugins</groupId>
8484
<artifactId>maven-release-plugin</artifactId>
85-
<version>3.1.1</version>
85+
<version>3.3.1</version>
8686
<configuration>
8787
<arguments>-Pgpg</arguments>
8888
</configuration>
8989
</plugin>
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-enforcer-plugin</artifactId>
93-
<version>3.5.0</version>
93+
<version>3.6.2</version>
9494
</plugin>
9595
<plugin>
9696
<groupId>org.apache.maven.plugins</groupId>
9797
<artifactId>maven-compiler-plugin</artifactId>
98-
<version>3.14.0</version>
98+
<version>3.15.0</version>
9999
</plugin>
100100
<plugin>
101101
<groupId>org.apache.maven.plugins</groupId>
102102
<artifactId>maven-gpg-plugin</artifactId>
103-
<version>3.2.7</version>
103+
<version>3.2.8</version>
104104
</plugin>
105105
<plugin>
106106
<groupId>org.apache.maven.plugins</groupId>
@@ -115,7 +115,7 @@
115115
<plugin>
116116
<groupId>org.apache.maven.plugins</groupId>
117117
<artifactId>maven-jar-plugin</artifactId>
118-
<version>3.4.2</version>
118+
<version>3.5.0</version>
119119
</plugin>
120120
<plugin>
121121
<groupId>org.apache.maven.plugins</groupId>
@@ -125,7 +125,7 @@
125125
<plugin>
126126
<groupId>org.apache.maven.plugins</groupId>
127127
<artifactId>maven-surefire-plugin</artifactId>
128-
<version>3.5.3</version>
128+
<version>3.5.5</version>
129129
</plugin>
130130
<plugin>
131131
<groupId>org.apache.maven.plugins</groupId>
@@ -145,7 +145,7 @@
145145
<plugin>
146146
<groupId>org.apache.maven.plugins</groupId>
147147
<artifactId>maven-javadoc-plugin</artifactId>
148-
<version>3.11.2</version>
148+
<version>3.12.0</version>
149149
</plugin>
150150
<plugin>
151151
<groupId>org.apache.maven.plugins</groupId>
@@ -169,7 +169,7 @@
169169
<plugin>
170170
<groupId>org.codehaus.mojo</groupId>
171171
<artifactId>versions-maven-plugin</artifactId>
172-
<version>2.18.0</version>
172+
<version>2.21.0</version>
173173
<configuration>
174174
<!-- https://www.mojohaus.org/versions/versions-maven-plugin/examples/display-dependency-updates.html -->
175175
<ignoredVersions>.*-M.*,.*-alpha.*</ignoredVersions>
@@ -248,7 +248,7 @@
248248
<dependency>
249249
<groupId>org.yaml</groupId>
250250
<artifactId>snakeyaml</artifactId>
251-
<version>2.4</version>
251+
<version>2.6</version>
252252
</dependency>
253253

254254
<!-- Test stuff -->
@@ -285,7 +285,7 @@
285285
<dependency>
286286
<groupId>commons-io</groupId>
287287
<artifactId>commons-io</artifactId>
288-
<version>2.19.0</version>
288+
<version>2.21.0</version>
289289
<type>jar</type>
290290
<scope>test</scope>
291291
</dependency>
@@ -353,7 +353,7 @@
353353
<plugin>
354354
<groupId>org.jacoco</groupId>
355355
<artifactId>jacoco-maven-plugin</artifactId>
356-
<version>0.8.13</version>
356+
<version>0.8.14</version>
357357
<executions>
358358
<execution>
359359
<id>prepare-agent</id>

0 commit comments

Comments
 (0)