Skip to content

Commit 670a7a8

Browse files
committed
Merge branch 'main' into make-hooks-thread-safer
# Conflicts: # .github/workflows/pullrequest.yml
2 parents 2a6bc56 + 5474c73 commit 670a7a8

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

.github/workflows/merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
2525
- name: Set up JDK 17
26-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
26+
uses: actions/setup-java@a7ab372554b6eb1a8eb25e7d9aec1cc9f3ea1a76
2727
with:
2828
java-version: '17'
2929
distribution: 'temurin'
@@ -50,7 +50,7 @@ jobs:
5050
run: mvn --batch-mode --update-snapshots verify
5151

5252
- name: Upload coverage to Codecov
53-
uses: codecov/[email protected].0
53+
uses: codecov/[email protected].1
5454
with:
5555
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
5656
flags: unittests # optional

.github/workflows/pullrequest.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
2323

2424
- name: Set up JDK ${{ matrix.build.java }}
25-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
25+
uses: actions/setup-java@a7ab372554b6eb1a8eb25e7d9aec1cc9f3ea1a76
2626
with:
2727
java-version: ${{ matrix.build.java }}
2828
distribution: 'temurin'
2929
cache: maven
3030

3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@02ab253bd299d261d00cdf8a9bca38fea2697d50
32+
uses: github/codeql-action/init@aa90e97ad2ed17cde6a43e89f70138299e64f837
3333
with:
3434
languages: java
3535

@@ -46,7 +46,7 @@ jobs:
4646

4747
- if: matrix.build.java == '17'
4848
name: Upload coverage to Codecov
49-
uses: codecov/[email protected].0
49+
uses: codecov/[email protected].1
5050
with:
5151
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
5252
flags: unittests # optional
@@ -55,4 +55,4 @@ jobs:
5555
verbose: true # optional (default = false)
5656

5757
- name: Perform CodeQL Analysis
58-
uses: github/codeql-action/analyze@02ab253bd299d261d00cdf8a9bca38fea2697d50
58+
uses: github/codeql-action/analyze@aa90e97ad2ed17cde6a43e89f70138299e64f837

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
4141

4242
- name: Set up JDK 17
43-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
43+
uses: actions/setup-java@a7ab372554b6eb1a8eb25e7d9aec1cc9f3ea1a76
4444
with:
4545
java-version: '17'
4646
distribution: 'temurin'

.github/workflows/static-code-scanning.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@02ab253bd299d261d00cdf8a9bca38fea2697d50
36+
uses: github/codeql-action/init@aa90e97ad2ed17cde6a43e89f70138299e64f837
3737
with:
3838
languages: java
3939

4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@02ab253bd299d261d00cdf8a9bca38fea2697d50
41+
uses: github/codeql-action/autobuild@aa90e97ad2ed17cde6a43e89f70138299e64f837
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@02ab253bd299d261d00cdf8a9bca38fea2697d50
44+
uses: github/codeql-action/analyze@aa90e97ad2ed17cde6a43e89f70138299e64f837

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@
5252
<dependency>
5353
<groupId>org.projectlombok</groupId>
5454
<artifactId>lombok</artifactId>
55-
<version>1.18.38</version>
55+
<version>1.18.40</version>
5656
<scope>provided</scope>
5757
</dependency>
5858

5959
<dependency>
6060
<!-- used so that lombok can generate suppressions for spotbugs. It needs to find it on the relevant classpath -->
6161
<groupId>com.github.spotbugs</groupId>
6262
<artifactId>spotbugs</artifactId>
63-
<version>4.9.4</version>
63+
<version>4.9.5</version>
6464
<scope>provided</scope>
6565
</dependency>
6666

@@ -201,7 +201,7 @@
201201
<dependency>
202202
<groupId>io.cucumber</groupId>
203203
<artifactId>cucumber-bom</artifactId>
204-
<version>7.27.2</version>
204+
<version>7.28.2</version>
205205
<type>pom</type>
206206
<scope>import</scope>
207207
</dependency>
@@ -264,7 +264,7 @@
264264
<plugin>
265265
<groupId>org.apache.maven.plugins</groupId>
266266
<artifactId>maven-surefire-plugin</artifactId>
267-
<version>3.5.3</version>
267+
<version>3.5.4</version>
268268
<configuration>
269269
<forkCount>1</forkCount>
270270
<reuseForks>false</reuseForks>
@@ -283,7 +283,7 @@
283283
<plugin>
284284
<groupId>org.apache.maven.plugins</groupId>
285285
<artifactId>maven-failsafe-plugin</artifactId>
286-
<version>3.5.3</version>
286+
<version>3.5.4</version>
287287
<configuration>
288288
<argLine>
289289
${surefireArgLine}
@@ -424,7 +424,7 @@
424424
<plugin>
425425
<groupId>com.github.spotbugs</groupId>
426426
<artifactId>spotbugs-maven-plugin</artifactId>
427-
<version>4.9.4.0</version>
427+
<version>4.9.4.2</version>
428428
<configuration>
429429
<excludeFilterFile>spotbugs-exclusions.xml</excludeFilterFile>
430430
<plugins>
@@ -440,7 +440,7 @@
440440
<dependency>
441441
<groupId>com.github.spotbugs</groupId>
442442
<artifactId>spotbugs</artifactId>
443-
<version>4.9.4</version>
443+
<version>4.9.5</version>
444444
</dependency>
445445
</dependencies>
446446
<executions>
@@ -684,7 +684,7 @@
684684
<plugin>
685685
<groupId>org.apache.maven.plugins</groupId>
686686
<artifactId>maven-surefire-plugin</artifactId>
687-
<version>3.5.3</version>
687+
<version>3.5.4</version>
688688
<configuration>
689689
<argLine>
690690
${surefireArgLine}
@@ -700,7 +700,7 @@
700700
<plugin>
701701
<groupId>org.apache.maven.plugins</groupId>
702702
<artifactId>maven-failsafe-plugin</artifactId>
703-
<version>3.5.3</version>
703+
<version>3.5.4</version>
704704
<configuration>
705705
<argLine>
706706
${surefireArgLine}

0 commit comments

Comments
 (0)