Skip to content

Commit 461ca50

Browse files
mpkorstanjempkorstanje
committed
Merge branch 'main' into reduce-mockito-usage-pass1
2 parents db31633 + ba6a53d commit 461ca50

File tree

61 files changed

+640
-275
lines changed

Some content is hidden

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

61 files changed

+640
-275
lines changed

Diff for: ‎.github/workflows/release-java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
environment: Release
1212
steps:
1313
- uses: actions/checkout@v4
14-
- uses: actions/setup-java@v3
14+
- uses: actions/setup-java@v4
1515
with:
1616
distribution: 'zulu'
1717
java-version: '17'

Diff for: ‎.github/workflows/test-java.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
strategy:
2020
matrix:
2121
os: [ ubuntu-latest, windows-latest ]
22-
version: [ 17, 19 ]
22+
version: [ 17, 21 ]
2323
name: 'Build Java ${{ matrix.version }} - ${{ matrix.os }}'
2424
runs-on: ${{ matrix.os }}
2525
steps:
2626
- uses: actions/checkout@v4
27-
- uses: actions/setup-java@v3
27+
- uses: actions/setup-java@v4
2828
with:
2929
distribution: 'zulu'
3030
java-version: ${{ matrix.version }}
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-latest
4242
steps:
4343
- uses: actions/checkout@v4
44-
- uses: actions/setup-java@v3
44+
- uses: actions/setup-java@v4
4545
with:
4646
distribution: 'zulu'
4747
java-version: '17'
@@ -56,7 +56,7 @@ jobs:
5656
runs-on: ubuntu-latest
5757
steps:
5858
- uses: actions/checkout@v4
59-
- uses: actions/setup-java@v3
59+
- uses: actions/setup-java@v4
6060
with:
6161
distribution: 'zulu'
6262
java-version: '17'
@@ -76,7 +76,7 @@ jobs:
7676
runs-on: ubuntu-latest
7777
steps:
7878
- uses: actions/checkout@v4
79-
- uses: actions/setup-java@v3
79+
- uses: actions/setup-java@v4
8080
with:
8181
distribution: 'zulu'
8282
java-version: '17'

Diff for: ‎.mvn/wrapper/maven-wrapper.properties

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
18-
distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18+
distributionSha256Sum=83aaf914c785c9faed661f223000a92d1de9553f5c82d3b4362e66d9c031625f
1919
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
20+
# Does not work properly on Windows, see https://issues.apache.org/jira/browse/MWRAPPER-103
21+
# wrapperSha256Sum=e63a53cfb9c4d291ebe3c2b0edacb7622bbc480326beaa5a0456e412f52f066a

Diff for: ‎CHANGELOG.md

+36-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,45 @@
33
All notable changes to the current version this project will be documented in
44
this file. For previous versions see the [release-notes archive](release-notes).
55

6-
For migration instructions from previous major version and a long form
6+
For migration instructions from previous major version and a long formF
77
explanation of noteworthy changes see the [Release Announcement](release-notes/v7.0.0.md).
88

99
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
1010
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1111

1212
## [Unreleased]
13+
- [Core] Improved support for multiple classloaders in IncrementingUuidGenerator ([#2853](https://github.com/cucumber/cucumber-jvm/pull/2853) J. Kronegg)
14+
### Changed
15+
- [TestNG] Update dependency org.testng:testng to v7.9.0
16+
- [Core] Update dependency io.cucumber:tag-expressions to v6.1.0
17+
- [Core] Update Messages and dependants ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
18+
- [Core] Update dependency io.cucumber:gherkin to v27.0.0
19+
- [Core] Added Malayalam localization ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
20+
- [Core] Added 'ed' to Italian ([#31](https://github.com/cucumber/gherkin/issues/160))
21+
- [Core] Added Danish translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
22+
- [Core] Added Dutch translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
23+
- [Core] Added Esperanto translation of "Rule" ([#2826](https://github.com/cucumber/cucumber-jvm/pull/2826)
24+
- [JUnit Platform] Use JUnit Platform 1.10.2 (JUnit Jupiter 5.10.2)
25+
- [Core] Added Vietnamese translation of "Rule" ([#204](https://github.com/cucumber/gherkin/pull/204))
26+
- [Core] Added Irish translation of "Rule" ([#216](https://github.com/cucumber/gherkin/pull/216))
27+
28+
### Fixed
29+
- [Core] Missing execution steps statuses ([#24](https://github.com/cucumber/cucumber-junit-xml-formatter/pull/24) F. Ahadi)
30+
31+
### Added
32+
- [JUnit Platform Engine] Improve Maven and Gradle compatibility ([#2832](https://github.com/cucumber/cucumber-jvm/pull/2832) M.P. Korstanje)
33+
34+
## [7.15.0] - 2023-12-11
35+
### Changed
36+
- [Core] Upgrade `vis-timeline` to v7.7.3
37+
38+
### Added
39+
- [Core] Support nested jar file systems (i.e. Spring Boot 3.2) ([#2830](https://github.com/cucumber/cucumber-jvm/pull/2830) M.P. Korstanje)
40+
41+
## [7.14.1] - 2023-11-25
42+
43+
### Fixed
44+
- [Guice] Inject static fields prior to before all hooks ([#2803](https://github.com/cucumber/cucumber-jvm/pull/2803) M.P. Korstanje)
1345

1446
## [7.14.0] - 2023-09-09
1547
### Changed
@@ -265,7 +297,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
265297
- [Weld] Removed `cucumber-weld` in favour of `cucumber-jakarta-cdi` or `cucumber-cdi2`. ([#2276](https://github.com/cucumber/cucumber-jvm/issues/2276) M.P. Korstanje)
266298
- [Needle] Removed `cucumber-needled` in favour of `cucumber-jakarta-cdi` or `cucumber-cdi2`. ([#2276](https://github.com/cucumber/cucumber-jvm/issues/2276) M.P. Korstanje)
267299

268-
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.14.0...HEAD
300+
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.15.0...HEAD
301+
[7.15.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.14.1...v7.15.0
302+
[7.14.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.14.0...v7.14.1
269303
[7.14.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.13.0...v7.14.0
270304
[7.13.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.1...v7.13.0
271305
[7.12.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.0...v7.12.1

Diff for: ‎LICENCE

-20
This file was deleted.

Diff for: ‎LICENSE

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
MIT License
2+
3+
Copyright (c) 2008 Aslak Hellesøy and contributors
4+
Copyright (c) 2013 Cucumber Ltd and contributors
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

Diff for: ‎RELEASING.md

-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
11
See [.github/RELEASING](https://github.com/cucumber/.github/blob/main/RELEASING.md).
2-
3-
## When done ##
4-
5-
Update the cucumber-jvm version in the documentation project:
6-
7-
* https://github.com/cucumber/docs.cucumber.io
8-
9-
The cucumber-jvm version for the docs is specified in the docs [versions.yaml](https://github.com/cucumber/docs.cucumber.io/blob/master/data/versions.yaml)
10-
11-
All done! Hurray!

Diff for: ‎compatibility/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<artifactId>cucumber-jvm</artifactId>
66
<groupId>io.cucumber</groupId>
7-
<version>7.14.1-SNAPSHOT</version>
7+
<version>7.16.0-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

@@ -13,8 +13,8 @@
1313

1414
<properties>
1515
<hamcrest.version>2.2</hamcrest.version>
16-
<jackson.version>2.15.3</jackson.version>
17-
<junit-jupiter.version>5.10.0</junit-jupiter.version>
16+
<jackson.version>2.16.1</jackson.version>
17+
<junit-jupiter.version>5.10.2</junit-jupiter.version>
1818
</properties>
1919

2020
<dependencyManagement>
@@ -51,7 +51,7 @@
5151
</dependency>
5252
<dependency>
5353
<groupId>org.hamcrest</groupId>
54-
<artifactId>hamcrest-core</artifactId>
54+
<artifactId>hamcrest</artifactId>
5555
<version>${hamcrest.version}</version>
5656
<scope>test</scope>
5757
</dependency>

Diff for: ‎cucumber-archetype/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.cucumber</groupId>
88
<artifactId>cucumber-jvm</artifactId>
9-
<version>7.14.1-SNAPSHOT</version>
9+
<version>7.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>cucumber-archetype</artifactId>
@@ -15,9 +15,9 @@
1515
<description>Cucumber JVM: Maven Archetype</description>
1616

1717
<properties>
18-
<junit-jupiter.version>5.10.0</junit-jupiter.version>
19-
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
20-
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
18+
<junit-jupiter.version>5.10.2</junit-jupiter.version>
19+
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
20+
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
2121
</properties>
2222

2323
<dependencyManagement>

Diff for: ‎cucumber-bom/pom.xml

+27-27
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>cucumber-jvm</artifactId>
55
<groupId>io.cucumber</groupId>
6-
<version>7.14.1-SNAPSHOT</version>
6+
<version>7.16.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<packaging>pom</packaging>
@@ -12,13 +12,13 @@
1212
<name>Cucumber-JVM: Bill of Materials</name>
1313

1414
<properties>
15-
<ci-environment.version>9.2.0</ci-environment.version>
16-
<cucumber-expressions.version>17.0.0</cucumber-expressions.version>
17-
<gherkin.version>26.2.0</gherkin.version>
18-
<html-formatter.version>20.4.0</html-formatter.version>
19-
<junit-xml-formatter.version>0.2.0</junit-xml-formatter.version>
20-
<messages.version>22.0.0</messages.version>
21-
<tag-expressions.version>6.0.0</tag-expressions.version>
15+
<ci-environment.version>10.0.1</ci-environment.version>
16+
<cucumber-expressions.version>17.0.2</cucumber-expressions.version>
17+
<gherkin.version>28.0.0</gherkin.version>
18+
<html-formatter.version>21.2.0</html-formatter.version>
19+
<junit-xml-formatter.version>0.2.1</junit-xml-formatter.version>
20+
<messages.version>24.0.1</messages.version>
21+
<tag-expressions.version>6.1.0</tag-expressions.version>
2222
</properties>
2323

2424
<dependencyManagement>
@@ -63,97 +63,97 @@
6363
<dependency>
6464
<groupId>io.cucumber</groupId>
6565
<artifactId>cucumber-cdi2</artifactId>
66-
<version>7.14.1-SNAPSHOT</version>
66+
<version>7.16.0-SNAPSHOT</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>io.cucumber</groupId>
7070
<artifactId>cucumber-core</artifactId>
71-
<version>7.14.1-SNAPSHOT</version>
71+
<version>7.16.0-SNAPSHOT</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>io.cucumber</groupId>
7575
<artifactId>datatable</artifactId>
76-
<version>7.14.1-SNAPSHOT</version>
76+
<version>7.16.0-SNAPSHOT</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>io.cucumber</groupId>
8080
<artifactId>datatable-matchers</artifactId>
81-
<version>7.14.1-SNAPSHOT</version>
81+
<version>7.16.0-SNAPSHOT</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>io.cucumber</groupId>
8585
<artifactId>cucumber-deltaspike</artifactId>
86-
<version>7.14.1-SNAPSHOT</version>
86+
<version>7.16.0-SNAPSHOT</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>io.cucumber</groupId>
9090
<artifactId>docstring</artifactId>
91-
<version>7.14.1-SNAPSHOT</version>
91+
<version>7.16.0-SNAPSHOT</version>
9292
</dependency>
9393
<dependency>
9494
<groupId>io.cucumber</groupId>
9595
<artifactId>cucumber-gherkin</artifactId>
96-
<version>7.14.1-SNAPSHOT</version>
96+
<version>7.16.0-SNAPSHOT</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>io.cucumber</groupId>
100100
<artifactId>cucumber-gherkin-messages</artifactId>
101-
<version>7.14.1-SNAPSHOT</version>
101+
<version>7.16.0-SNAPSHOT</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>io.cucumber</groupId>
105105
<artifactId>cucumber-guice</artifactId>
106-
<version>7.14.1-SNAPSHOT</version>
106+
<version>7.16.0-SNAPSHOT</version>
107107
</dependency>
108108
<dependency>
109109
<groupId>io.cucumber</groupId>
110110
<artifactId>cucumber-jakarta-cdi</artifactId>
111-
<version>7.14.1-SNAPSHOT</version>
111+
<version>7.16.0-SNAPSHOT</version>
112112
</dependency>
113113
<dependency>
114114
<groupId>io.cucumber</groupId>
115115
<artifactId>cucumber-java</artifactId>
116-
<version>7.14.1-SNAPSHOT</version>
116+
<version>7.16.0-SNAPSHOT</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>io.cucumber</groupId>
120120
<artifactId>cucumber-java8</artifactId>
121-
<version>7.14.1-SNAPSHOT</version>
121+
<version>7.16.0-SNAPSHOT</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>io.cucumber</groupId>
125125
<artifactId>cucumber-junit</artifactId>
126-
<version>7.14.1-SNAPSHOT</version>
126+
<version>7.16.0-SNAPSHOT</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>io.cucumber</groupId>
130130
<artifactId>cucumber-junit-platform-engine</artifactId>
131-
<version>7.14.1-SNAPSHOT</version>
131+
<version>7.16.0-SNAPSHOT</version>
132132
</dependency>
133133
<dependency>
134134
<groupId>io.cucumber</groupId>
135135
<artifactId>cucumber-openejb</artifactId>
136-
<version>7.14.1-SNAPSHOT</version>
136+
<version>7.16.0-SNAPSHOT</version>
137137
</dependency>
138138
<dependency>
139139
<groupId>io.cucumber</groupId>
140140
<artifactId>cucumber-picocontainer</artifactId>
141-
<version>7.14.1-SNAPSHOT</version>
141+
<version>7.16.0-SNAPSHOT</version>
142142
</dependency>
143143
<dependency>
144144
<groupId>io.cucumber</groupId>
145145
<artifactId>cucumber-plugin</artifactId>
146-
<version>7.14.1-SNAPSHOT</version>
146+
<version>7.16.0-SNAPSHOT</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>io.cucumber</groupId>
150150
<artifactId>cucumber-spring</artifactId>
151-
<version>7.14.1-SNAPSHOT</version>
151+
<version>7.16.0-SNAPSHOT</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>io.cucumber</groupId>
155155
<artifactId>cucumber-testng</artifactId>
156-
<version>7.14.1-SNAPSHOT</version>
156+
<version>7.16.0-SNAPSHOT</version>
157157
</dependency>
158158
</dependencies>
159159
</dependencyManagement>

0 commit comments

Comments
 (0)