Skip to content

Commit 373eb11

Browse files
author
Julien Kronegg
committed
Merge branch 'main' into reduce-mockito-usage-pass1
# Conflicts: # cucumber-guice/pom.xml # cucumber-java/pom.xml # cucumber-java8/pom.xml # cucumber-junit/pom.xml # cucumber-spring/pom.xml # cucumber-testng/pom.xml # datatable/pom.xml
2 parents f33a2a6 + c82382e commit 373eb11

File tree

61 files changed

+253
-223
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

+253
-223
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- uses: cucumber/[email protected]
1717
with:
1818
github-token: ${{ secrets.GITHUB_TOKEN }}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
environment: Release
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- uses: actions/setup-java@v3
1515
with:
1616
distribution: 'zulu'

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: 'Build Java ${{ matrix.version }} - ${{ matrix.os }}'
2424
runs-on: ${{ matrix.os }}
2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
- uses: actions/setup-java@v3
2828
with:
2929
distribution: 'zulu'
@@ -40,7 +40,7 @@ jobs:
4040
name: 'Javadoc'
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
4444
- uses: actions/setup-java@v3
4545
with:
4646
distribution: 'zulu'
@@ -55,7 +55,7 @@ jobs:
5555
name: 'Coverage'
5656
runs-on: ubuntu-latest
5757
steps:
58-
- uses: actions/checkout@v3
58+
- uses: actions/checkout@v4
5959
- uses: actions/setup-java@v3
6060
with:
6161
distribution: 'zulu'
@@ -75,7 +75,7 @@ jobs:
7575
name: 'Semver'
7676
runs-on: ubuntu-latest
7777
steps:
78-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v4
7979
- uses: actions/setup-java@v3
8080
with:
8181
distribution: 'zulu'

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
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.4/apache-maven-3.9.4-bin.zip
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
1819
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

Diff for: ‎CHANGELOG.md

+15-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
## [Unreleased]
1313

14+
## [7.14.0] - 2023-09-09
15+
### Changed
16+
- [Core] Update dependency io.cucumber:html-formatter to v20.4.0
17+
- [Core] Download attachments that are not video, image or text from the html report ([react-components/#333](https://github.com/cucumber/react-components/pull/333) David J. Goss)
18+
19+
### Fixed
20+
- [Core] Exclude Multi-Release files from Jackson while shading ([#2786](https://github.com/cucumber/cucumber-jvm/pull/2786) M.P. Korstanje)
21+
1422
## [7.13.0] - 2023-07-02
1523
### Changed
1624
- [TestNG] Update dependency org.testng:testng to v7.8.0
@@ -257,12 +265,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
257265
- [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)
258266
- [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)
259267

260-
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.13.0...main
261-
[7.13.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.1...main
262-
[7.12.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.0...main
263-
[7.12.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.2...main
264-
[7.11.2]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...main
265-
[7.11.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.0...main
268+
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.14.0...HEAD
269+
[7.14.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.13.0...v7.14.0
270+
[7.13.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.1...v7.13.0
271+
[7.12.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.0...v7.12.1
272+
[7.12.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.2...v7.12.0
273+
[7.11.2]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...v7.11.2
274+
[7.11.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.0...v7.11.1
266275
[7.11.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.10.1...v7.11.0
267276
[7.10.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.10.0...v7.10.1
268277
[7.10.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.9.0...v7.10.0

Diff for: ‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
We appreciate that. Do keep the following in mind:
44

5-
* Before making significant contribution consider discussing the outline of
5+
* Before making a significant contribution, consider discussing the outline of
66
your solution first. This may avoid a duplication of efforts.
77
* When you send a [pull requests](https://help.github.com/articles/using-pull-requests),
88
please include tests to go along with it.
@@ -25,7 +25,7 @@ When building the project for the first time, run:
2525
The `cucumber-archetype` modules integration tests against `-SNAPSHOT`
2626
versions of Cucumber. These must be installed first.
2727

28-
Afterwards `./mvnw test` or `./mvnw verify` should work as expected.
28+
Afterward `./mvnw test` or `./mvnw verify` should work as expected.
2929

3030
## Formatting Java
3131

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Cucumber-JVM also integrates with all the popular
2222

2323
## Upgrading?
2424

25-
Migration instructions from previous major version and a long form
25+
Migration instructions from previous major versions and a long form
2626
explanation of noteworthy changes can be found in the [release-notes archive](release-notes)
2727

2828
The changes for the current major version can be found in the [CHANGELOG.md](CHANGELOG.md).

Diff for: ‎compatibility/pom.xml

+2-2
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.0-SNAPSHOT</version>
7+
<version>7.14.1-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

@@ -13,7 +13,7 @@
1313

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

Diff for: ‎cucumber-archetype/pom.xml

+1-1
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.0-SNAPSHOT</version>
9+
<version>7.14.1-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>cucumber-archetype</artifactId>

Diff for: ‎cucumber-bom/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Bill of Materials
22

33
It is fairly common for one project to use more than one Cucumber dependency. To
4-
keep these version in sync a Bill of Materials can be used.
4+
keep these versions in sync, a Bill of Materials can be used.
55

66
## Usage
77

Diff for: ‎cucumber-bom/pom.xml

+22-22
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.0-SNAPSHOT</version>
6+
<version>7.14.1-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<packaging>pom</packaging>
@@ -13,12 +13,12 @@
1313

1414
<properties>
1515
<ci-environment.version>9.2.0</ci-environment.version>
16-
<cucumber-expressions.version>16.1.2</cucumber-expressions.version>
16+
<cucumber-expressions.version>17.0.0</cucumber-expressions.version>
1717
<gherkin.version>26.2.0</gherkin.version>
1818
<html-formatter.version>20.4.0</html-formatter.version>
1919
<junit-xml-formatter.version>0.2.0</junit-xml-formatter.version>
2020
<messages.version>22.0.0</messages.version>
21-
<tag-expressions.version>5.0.2</tag-expressions.version>
21+
<tag-expressions.version>6.0.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.0-SNAPSHOT</version>
66+
<version>7.14.1-SNAPSHOT</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>io.cucumber</groupId>
7070
<artifactId>cucumber-core</artifactId>
71-
<version>7.14.0-SNAPSHOT</version>
71+
<version>7.14.1-SNAPSHOT</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>io.cucumber</groupId>
7575
<artifactId>datatable</artifactId>
76-
<version>7.14.0-SNAPSHOT</version>
76+
<version>7.14.1-SNAPSHOT</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>io.cucumber</groupId>
8080
<artifactId>datatable-matchers</artifactId>
81-
<version>7.14.0-SNAPSHOT</version>
81+
<version>7.14.1-SNAPSHOT</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>io.cucumber</groupId>
8585
<artifactId>cucumber-deltaspike</artifactId>
86-
<version>7.14.0-SNAPSHOT</version>
86+
<version>7.14.1-SNAPSHOT</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>io.cucumber</groupId>
9090
<artifactId>docstring</artifactId>
91-
<version>7.14.0-SNAPSHOT</version>
91+
<version>7.14.1-SNAPSHOT</version>
9292
</dependency>
9393
<dependency>
9494
<groupId>io.cucumber</groupId>
9595
<artifactId>cucumber-gherkin</artifactId>
96-
<version>7.14.0-SNAPSHOT</version>
96+
<version>7.14.1-SNAPSHOT</version>
9797
</dependency>
9898
<dependency>
9999
<groupId>io.cucumber</groupId>
100100
<artifactId>cucumber-gherkin-messages</artifactId>
101-
<version>7.14.0-SNAPSHOT</version>
101+
<version>7.14.1-SNAPSHOT</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>io.cucumber</groupId>
105105
<artifactId>cucumber-guice</artifactId>
106-
<version>7.14.0-SNAPSHOT</version>
106+
<version>7.14.1-SNAPSHOT</version>
107107
</dependency>
108108
<dependency>
109109
<groupId>io.cucumber</groupId>
110110
<artifactId>cucumber-jakarta-cdi</artifactId>
111-
<version>7.14.0-SNAPSHOT</version>
111+
<version>7.14.1-SNAPSHOT</version>
112112
</dependency>
113113
<dependency>
114114
<groupId>io.cucumber</groupId>
115115
<artifactId>cucumber-java</artifactId>
116-
<version>7.14.0-SNAPSHOT</version>
116+
<version>7.14.1-SNAPSHOT</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>io.cucumber</groupId>
120120
<artifactId>cucumber-java8</artifactId>
121-
<version>7.14.0-SNAPSHOT</version>
121+
<version>7.14.1-SNAPSHOT</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>io.cucumber</groupId>
125125
<artifactId>cucumber-junit</artifactId>
126-
<version>7.14.0-SNAPSHOT</version>
126+
<version>7.14.1-SNAPSHOT</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>io.cucumber</groupId>
130130
<artifactId>cucumber-junit-platform-engine</artifactId>
131-
<version>7.14.0-SNAPSHOT</version>
131+
<version>7.14.1-SNAPSHOT</version>
132132
</dependency>
133133
<dependency>
134134
<groupId>io.cucumber</groupId>
135135
<artifactId>cucumber-openejb</artifactId>
136-
<version>7.14.0-SNAPSHOT</version>
136+
<version>7.14.1-SNAPSHOT</version>
137137
</dependency>
138138
<dependency>
139139
<groupId>io.cucumber</groupId>
140140
<artifactId>cucumber-picocontainer</artifactId>
141-
<version>7.14.0-SNAPSHOT</version>
141+
<version>7.14.1-SNAPSHOT</version>
142142
</dependency>
143143
<dependency>
144144
<groupId>io.cucumber</groupId>
145145
<artifactId>cucumber-plugin</artifactId>
146-
<version>7.14.0-SNAPSHOT</version>
146+
<version>7.14.1-SNAPSHOT</version>
147147
</dependency>
148148
<dependency>
149149
<groupId>io.cucumber</groupId>
150150
<artifactId>cucumber-spring</artifactId>
151-
<version>7.14.0-SNAPSHOT</version>
151+
<version>7.14.1-SNAPSHOT</version>
152152
</dependency>
153153
<dependency>
154154
<groupId>io.cucumber</groupId>
155155
<artifactId>cucumber-testng</artifactId>
156-
<version>7.14.0-SNAPSHOT</version>
156+
<version>7.14.1-SNAPSHOT</version>
157157
</dependency>
158158
</dependencies>
159159
</dependencyManagement>

Diff for: ‎cucumber-cdi2/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Cucumber CDI 2
22
==============
33

4-
Use CDI Standalone Edition (CDI SE) API to provide dependency injection in to
5-
steps definitions
4+
Use CDI Standalone Edition (CDI SE) API to provide dependency injection into
5+
steps definitions.
66

77
Add the `cucumber-cdi2` dependency to your pom.xml:
88

@@ -48,7 +48,7 @@ And for Weld it is:
4848

4949
## Usage
5050

51-
For each scenario a new CDI container is started. If not present in the
51+
For each scenario, a new CDI container is started. If not present in the
5252
container, step definitions are added as unmanaged beans and dependencies are
5353
injected.
5454

Diff for: ‎cucumber-cdi2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>io.cucumber</groupId>
1616
<artifactId>cucumber-jvm</artifactId>
17-
<version>7.14.0-SNAPSHOT</version>
17+
<version>7.14.1-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>cucumber-cdi2</artifactId>

Diff for: ‎cucumber-core/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Cucumber Core
44
Provides components needed to discover, parse and execute feature files. The
55
core is designed with a few extension systems and plugin points. You
66
typically don't depend directly on `cucumber-core` but rather use the different
7-
submodules together e.g. `cucumber-junit` and `cucumber-java`.
7+
submodules together e.g. `cucumber-junit` and `cucumber-java`.
88

99
## Properties, Environment variables, System Options ##
1010

@@ -79,7 +79,7 @@ Each property also has an `UPPER_CASE` and `snake_case` variant. For example
7979
## Backend ##
8080

8181
Backends consist of two components: a `Backend`, and an optional `ObjectFactory`.
82-
They are respectively responsible for discovering glue classes, registering
82+
They are respectively responsible for discovering glue classes, registering
8383
step definitions, and creating instances of said glue classes. Backend and
8484
object factory implementations are discovered via SPI.
8585

@@ -96,13 +96,13 @@ An event has a UUID. The UUID generator can be configured using the `cucumber.uu
9696
| io.cucumber.core.eventbus.RandomUuidGenerator | Thread-safe, collision-free, multi-jvm | ~1 | Reports may be generated on different JVMs at the same time. A typical example would be one suite that tests against Firefox and another against Safari. The exact browser is configured through a property. These are then executed concurrently on different Gitlab runners. |
9797
| io.cucumber.core.eventbus.IncrementingUuidGenerator | Thread-safe, collision-free, single-jvm | ~130 | Reports are generated on a single JVM |
9898

99-
The performance gain on real project depend on the feature size.
99+
The performance gain on real projects depends on the feature size.
100100

101101
When not specified, the `RandomUuidGenerator` is used.
102102

103103
## Plugin ##
104104

105-
By implementing the Plugin interface classes can listen to execution events
105+
By implementing the Plugin interface, classes can listen to execution events
106106
inside Cucumber JVM. Consider using a Plugin when creating test execution reports.
107107

108108
## FileSystem ##

0 commit comments

Comments
 (0)