Skip to content

Commit c22da3e

Browse files
authored
Merge branch 'main' into Flaky-build-due-to-a-possible-race-condition-#1449
2 parents 6a4fa3d + 4481537 commit c22da3e

File tree

6 files changed

+14
-24
lines changed

6 files changed

+14
-24
lines changed

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
24+
- uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
2525
- name: Set up JDK 17
2626
uses: actions/setup-java@f4f1212c880fdec8162ea9a6493f4495191887b4
2727
with:

.github/workflows/pullrequest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ matrix.os}}
2020
steps:
2121
- name: Check out the code
22-
uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
22+
uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
2323

2424
- name: Set up JDK 11
2525
uses: actions/setup-java@f4f1212c880fdec8162ea9a6493f4495191887b4
@@ -29,7 +29,7 @@ jobs:
2929
cache: maven
3030

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

@@ -55,4 +55,4 @@ jobs:
5555
verbose: true # optional (default = false)
5656

5757
- name: Perform CodeQL Analysis
58-
uses: github/codeql-action/analyze@bc02a25f6449997c5e9d5a368879b28f56ae19a1
58+
uses: github/codeql-action/analyze@b1e4dc3db58c9601794e22a9f6d28d45461b9dbf

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout Repository
40-
uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
40+
uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
4141

4242
- name: Set up JDK 17
4343
uses: actions/setup-java@f4f1212c880fdec8162ea9a6493f4495191887b4

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ jobs:
2929

3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
32+
uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
3333

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

4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@bc02a25f6449997c5e9d5a368879b28f56ae19a1
41+
uses: github/codeql-action/autobuild@b1e4dc3db58c9601794e22a9f6d28d45461b9dbf
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@bc02a25f6449997c5e9d5a368879b28f56ae19a1
44+
uses: github/codeql-action/analyze@b1e4dc3db58c9601794e22a9f6d28d45461b9dbf

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# under the License.
1717
wrapperVersion=3.3.2
1818
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip

pom.xml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
15-
<junit.jupiter.version>5.12.2</junit.jupiter.version>
16-
<io.cucumber.version>7.22.2</io.cucumber.version>
1715
<org.mockito.version>5.18.0</org.mockito.version>
1816
<!-- exclusion expression for e2e tests -->
1917
<testExclusions>**/e2e/*.java</testExclusions>
@@ -97,56 +95,48 @@
9795
<dependency>
9896
<groupId>org.junit.jupiter</groupId>
9997
<artifactId>junit-jupiter</artifactId>
100-
<version>${junit.jupiter.version}</version>
10198
<scope>test</scope>
10299
</dependency>
103100

104101
<dependency>
105102
<groupId>org.junit.jupiter</groupId>
106103
<artifactId>junit-jupiter-engine</artifactId>
107-
<version>${junit.jupiter.version}</version>
108104
<scope>test</scope>
109105
</dependency>
110106

111107
<dependency>
112108
<groupId>org.junit.jupiter</groupId>
113109
<artifactId>junit-jupiter-api</artifactId>
114-
<version>${junit.jupiter.version}</version>
115110
<scope>test</scope>
116111
</dependency>
117112

118113
<dependency>
119114
<groupId>org.junit.jupiter</groupId>
120115
<artifactId>junit-jupiter-params</artifactId>
121-
<version>${junit.jupiter.version}</version>
122116
<scope>test</scope>
123117
</dependency>
124118

125119
<dependency>
126120
<groupId>org.junit.platform</groupId>
127121
<artifactId>junit-platform-suite</artifactId>
128-
<version>1.12.2</version>
129122
<scope>test</scope>
130123
</dependency>
131124

132125
<dependency>
133126
<groupId>io.cucumber</groupId>
134127
<artifactId>cucumber-java</artifactId>
135-
<version>${io.cucumber.version}</version>
136128
<scope>test</scope>
137129
</dependency>
138130

139131
<dependency>
140132
<groupId>io.cucumber</groupId>
141133
<artifactId>cucumber-junit-platform-engine</artifactId>
142-
<version>${io.cucumber.version}</version>
143134
<scope>test</scope>
144135
</dependency>
145136

146137
<dependency>
147138
<groupId>io.cucumber</groupId>
148139
<artifactId>cucumber-picocontainer</artifactId>
149-
<version>${io.cucumber.version}</version>
150140
<scope>test</scope>
151141
</dependency>
152142

@@ -204,15 +194,15 @@
204194
<dependency>
205195
<groupId>io.cucumber</groupId>
206196
<artifactId>cucumber-bom</artifactId>
207-
<version>7.22.2</version>
197+
<version>7.23.0</version>
208198
<type>pom</type>
209199
<scope>import</scope>
210200
</dependency>
211201

212202
<dependency>
213203
<groupId>org.junit</groupId>
214204
<artifactId>junit-bom</artifactId>
215-
<version>5.12.2</version>
205+
<version>5.13.1</version>
216206
<type>pom</type>
217207
<scope>import</scope>
218208
</dependency>
@@ -457,7 +447,7 @@
457447
<dependency>
458448
<groupId>com.puppycrawl.tools</groupId>
459449
<artifactId>checkstyle</artifactId>
460-
<version>10.24.0</version>
450+
<version>10.25.0</version>
461451
</dependency>
462452
</dependencies>
463453
<executions>
@@ -622,7 +612,7 @@
622612
<plugin>
623613
<groupId>org.codehaus.mojo</groupId>
624614
<artifactId>exec-maven-plugin</artifactId>
625-
<version>3.5.0</version>
615+
<version>3.5.1</version>
626616
<executions>
627617
<execution>
628618
<id>update-test-harness-submodule</id>

0 commit comments

Comments
 (0)