Skip to content

Commit 91f48b2

Browse files
rozenshteynrozenshteyn
authored
Merge branch 'cucumber:main' into main
2 parents 38c0067 + 4df2198 commit 91f48b2

File tree

39 files changed

+112
-97
lines changed

39 files changed

+112
-97
lines changed

‎CHANGELOG.md

+14-4
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,26 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
88
## [Unreleased] (In Git)
99

1010
### Added
11-
* [Core] Include `DefaultObjectFactory` as part of the API ([#2400](https://github.com/cucumber/cucumber-jvm/pull/2400) M.P. Korstanje)
1211

1312
### Changed
14-
* [Core] Update dependency io.cucumber:tag-expressions to v4.1.0
15-
- support escape backslashes in tag expressions ([common/#1778](https://github.com/cucumber/common/pull/1778) Yusuke Noda)
13+
1614
### Deprecated
1715

1816
### Removed
1917

2018
### Fixed
2119

20+
## [7.1.0] (2021-11-28)
21+
22+
### Added
23+
* [Core] Include `DefaultObjectFactory` as part of the API ([#2400](https://github.com/cucumber/cucumber-jvm/pull/2400) M.P. Korstanje)
24+
25+
### Changed
26+
* [Core] Update dependency io.cucumber:tag-expressions to v4.1.0
27+
- support escape backslashes in tag expressions ([common/#1778](https://github.com/cucumber/common/pull/1778) Yusuke Noda)
28+
* [JUnit Platform] Use JUnit Platform 1.8.2 (JUnit Jupiter 5.8.2)
29+
### Deprecated
30+
* [Core] Deprecated forgotten `TypeRegistry`.
2231
## [7.0.0] (2021-10-06) - [Release Announcement](release-notes/v7.0.0.md)
2332

2433
## [7.0.0-RC1] (2021-09-11)
@@ -1691,7 +1700,8 @@ in `cucumber.api` stable from now on, with proper deprecation warnings in case s
16911700
* First proper release
16921701

16931702
<!-- Releases -->
1694-
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.0.0...main
1703+
[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.1.0...main
1704+
[7.1.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.0.0-RC1...v7.1.0
16951705
[7.0.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.0.0-RC1...v7.0.0
16961706
[7.0.0-RC1]: https://github.com/cucumber/cucumber-jvm/compare/v6.11.0...v7.0.0-RC1
16971707
[6.11.0]: https://github.com/cucumber/cucumber-jvm/compare/v6.10.4...v6.11.0

‎archetype/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.1.0-SNAPSHOT</version>
8+
<version>7.1.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>cucumber-archetype</artifactId>
@@ -14,7 +14,7 @@
1414
<description>Cucumber JVM: Maven Archetype</description>
1515

1616
<properties>
17-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
17+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
1818
</properties>
1919

2020
<!-- Not used by this module, but used by the integration tests of

‎bom/pom.xml

+16-16
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.1.0-SNAPSHOT</version>
6+
<version>7.1.1-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<packaging>pom</packaging>
@@ -12,7 +12,7 @@
1212
<name>Cucumber-JVM: Bill of Materials</name>
1313

1414
<properties>
15-
<create-meta.version>6.0.2</create-meta.version>
15+
<create-meta.version>6.0.4</create-meta.version>
1616
<cucumber-expressions.version>13.0.1</cucumber-expressions.version>
1717
<datatable.version>4.1.0</datatable.version>
1818
<html-formatter.version>17.0.0</html-formatter.version>
@@ -45,12 +45,12 @@
4545
<dependency>
4646
<groupId>io.cucumber</groupId>
4747
<artifactId>datatable</artifactId>
48-
<version>7.1.0-SNAPSHOT</version>
48+
<version>7.1.1-SNAPSHOT</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>io.cucumber</groupId>
5252
<artifactId>datatable-matchers</artifactId>
53-
<version>7.1.0-SNAPSHOT</version>
53+
<version>7.1.1-SNAPSHOT</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>io.cucumber</groupId>
@@ -66,62 +66,62 @@
6666
<dependency>
6767
<groupId>io.cucumber</groupId>
6868
<artifactId>docstring</artifactId>
69-
<version>7.1.0-SNAPSHOT</version>
69+
<version>7.1.1-SNAPSHOT</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>io.cucumber</groupId>
7373
<artifactId>cucumber-plugin</artifactId>
74-
<version>7.1.0-SNAPSHOT</version>
74+
<version>7.1.1-SNAPSHOT</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>io.cucumber</groupId>
7878
<artifactId>cucumber-core</artifactId>
79-
<version>7.1.0-SNAPSHOT</version>
79+
<version>7.1.1-SNAPSHOT</version>
8080
</dependency>
8181
<dependency>
8282
<groupId>io.cucumber</groupId>
8383
<artifactId>cucumber-java</artifactId>
84-
<version>7.1.0-SNAPSHOT</version>
84+
<version>7.1.1-SNAPSHOT</version>
8585
</dependency>
8686
<dependency>
8787
<groupId>io.cucumber</groupId>
8888
<artifactId>cucumber-java8</artifactId>
89-
<version>7.1.0-SNAPSHOT</version>
89+
<version>7.1.1-SNAPSHOT</version>
9090
</dependency>
9191
<dependency>
9292
<groupId>io.cucumber</groupId>
9393
<artifactId>cucumber-spring</artifactId>
94-
<version>7.1.0-SNAPSHOT</version>
94+
<version>7.1.1-SNAPSHOT</version>
9595
</dependency>
9696
<dependency>
9797
<groupId>io.cucumber</groupId>
9898
<artifactId>cucumber-junit</artifactId>
99-
<version>7.1.0-SNAPSHOT</version>
99+
<version>7.1.1-SNAPSHOT</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>io.cucumber</groupId>
103103
<artifactId>cucumber-testng</artifactId>
104-
<version>7.1.0-SNAPSHOT</version>
104+
<version>7.1.1-SNAPSHOT</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>io.cucumber</groupId>
108108
<artifactId>cucumber-picocontainer</artifactId>
109-
<version>7.1.0-SNAPSHOT</version>
109+
<version>7.1.1-SNAPSHOT</version>
110110
</dependency>
111111
<dependency>
112112
<groupId>io.cucumber</groupId>
113113
<artifactId>cucumber-gherkin</artifactId>
114-
<version>7.1.0-SNAPSHOT</version>
114+
<version>7.1.1-SNAPSHOT</version>
115115
</dependency>
116116
<dependency>
117117
<groupId>io.cucumber</groupId>
118118
<artifactId>cucumber-gherkin-messages</artifactId>
119-
<version>7.1.0-SNAPSHOT</version>
119+
<version>7.1.1-SNAPSHOT</version>
120120
</dependency>
121121
<dependency>
122122
<groupId>io.cucumber</groupId>
123123
<artifactId>cucumber-junit-platform-engine</artifactId>
124-
<version>7.1.0-SNAPSHOT</version>
124+
<version>7.1.1-SNAPSHOT</version>
125125
</dependency>
126126
</dependencies>
127127
</dependencyManagement>

‎cdi2/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<openwebbeans.version>2.0.23</openwebbeans.version>
88
<weld-se-core.version>3.1.8.Final</weld-se-core.version>
99
<apiguardian-api.version>1.1.2</apiguardian-api.version>
10-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
10+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
1111
<hamcrest.version>2.2</hamcrest.version>
1212
</properties>
1313

1414
<parent>
1515
<groupId>io.cucumber</groupId>
1616
<artifactId>cucumber-jvm</artifactId>
17-
<version>7.1.0-SNAPSHOT</version>
17+
<version>7.1.1-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>cucumber-cdi2</artifactId>

‎compatibility/pom.xml

+2-2
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.1.0-SNAPSHOT</version>
6+
<version>7.1.1-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

@@ -12,7 +12,7 @@
1212

1313
<properties>
1414
<hamcrest.version>2.2</hamcrest.version>
15-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
15+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
1616
</properties>
1717

1818
<dependencyManagement>

‎core/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-jvm</artifactId>
7-
<version>7.1.0-SNAPSHOT</version>
7+
<version>7.1.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-core</artifactId>
@@ -16,11 +16,11 @@
1616
<apiguardian-api.version>1.1.2</apiguardian-api.version>
1717
<jackson-databind.version>2.13.0</jackson-databind.version>
1818
<jsoup.version>1.14.3</jsoup.version>
19-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
19+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
2020
<xmlunit.version>2.8.3</xmlunit.version>
2121
<hamcrest.version>2.2</hamcrest.version>
2222
<hamcrest-json.version>0.2</hamcrest-json.version>
23-
<mockito.version>4.0.0</mockito.version>
23+
<mockito.version>4.1.0</mockito.version>
2424
<vertx.version>4.2.1</vertx.version>
2525
<reactive-streams.version>1.0.3</reactive-streams.version>
2626
</properties>

‎core/src/main/java/io/cucumber/core/api/TypeRegistry.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77
import io.cucumber.datatable.TableEntryByTypeTransformer;
88
import io.cucumber.docstring.DocStringType;
99
import org.apiguardian.api.API;
10+
import org.apiguardian.api.API.Status;
1011

1112
/**
1213
* The type registry records defines parameter types, data table types and
1314
* docstring transformers.
15+
*
16+
* @deprecated use the dedicated type annotations to register data table and
17+
* parameter types instead
1418
*/
15-
@API(status = API.Status.STABLE)
19+
@API(status = Status.STABLE)
20+
@Deprecated
1621
public interface TypeRegistry {
1722

1823
/**

‎datatable-matchers/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.1.0-SNAPSHOT</version>
8+
<version>7.1.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>datatable-matchers</artifactId>
@@ -17,7 +17,7 @@
1717
<apiguardian-api.version>1.1.2</apiguardian-api.version>
1818
<guava.version>31.0.1-jre</guava.version>
1919
<hamcrest.version>2.2</hamcrest.version>
20-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
20+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
2121
</properties>
2222

2323
<dependencyManagement>

‎datatable/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.1.0-SNAPSHOT</version>
8+
<version>7.1.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>datatable</artifactId>
@@ -19,8 +19,8 @@
1919
<guava.version>31.0.1-jre</guava.version>
2020
<hamcrest.version>2.2</hamcrest.version>
2121
<jackson-databind.version>2.13.0</jackson-databind.version>
22-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
23-
<mockito.version>4.0.0</mockito.version>
22+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
23+
<mockito.version>4.1.0</mockito.version>
2424
</properties>
2525

2626
<dependencyManagement>

‎datatable/src/main/java/io/cucumber/datatable/TableEntryByTypeTransformer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
/**
99
* Default transformer for entries which don't have registered
10-
* {@link DataTableType} in {@code TypeRegistry}. Similar to
11-
* {@link TableEntryTransformer} but additionally it receives {@code Class<T>}
12-
* of expected object and {@link TableCellByTypeTransformer} for transforming
13-
* individual cells from {@code String} to arbitrary type.
10+
* {@link DataTableType}. Similar to {@link TableEntryTransformer} but
11+
* additionally it receives {@code Class<T>} of expected object and
12+
* {@link TableCellByTypeTransformer} for transforming individual cells from
13+
* {@code String} to arbitrary type.
1414
*
1515
* @see TableEntryTransformer
1616
*/

‎deltaspike/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.cucumber</groupId>
77
<artifactId>cucumber-jvm</artifactId>
8-
<version>7.1.0-SNAPSHOT</version>
8+
<version>7.1.1-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>cucumber-deltaspike</artifactId>
@@ -16,7 +16,7 @@
1616
<apiguardian-api.version>1.1.2</apiguardian-api.version>
1717
<cdi-api.version>1.2</cdi-api.version>
1818
<deltaspike.version>1.9.5</deltaspike.version>
19-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
19+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
2020
<project.Automatic-Module-Name>io.cucumber.deltaspike</project.Automatic-Module-Name>
2121
</properties>
2222

‎docstring/pom.xml

+2-2
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.1.0-SNAPSHOT</version>
6+
<version>7.1.1-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

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

1414
<properties>
1515
<jackson-databind.version>2.13.0</jackson-databind.version>
16-
<junit-jupiter.version>5.8.1</junit-jupiter.version>
16+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
1717
<apiguardian-api.version>1.1.2</apiguardian-api.version>
1818
<project.Automatic-Module-Name>io.cucumber.docstring</project.Automatic-Module-Name>
1919
<hamcrest.version>2.2</hamcrest.version>

‎examples/calculator-java-cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.1.0-SNAPSHOT</version>
7+
<version>7.1.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-cli</artifactId>

‎examples/calculator-java-junit4/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.1.0-SNAPSHOT</version>
7+
<version>7.1.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-junit4</artifactId>
@@ -13,7 +13,7 @@
1313

1414
<properties>
1515
<project.Automatic-Module-Name>io.cucumber.examples.calculator</project.Automatic-Module-Name>
16-
<jackson-databind.version>2.12.4</jackson-databind.version>
16+
<jackson-databind.version>2.13.0</jackson-databind.version>
1717
</properties>
1818

1919
<dependencyManagement>

‎examples/calculator-java-junit5/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.1.0-SNAPSHOT</version>
7+
<version>7.1.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-junit5</artifactId>
@@ -13,8 +13,8 @@
1313

1414
<properties>
1515
<project.Automatic-Module-Name>io.cucumber.calculator</project.Automatic-Module-Name>
16-
<jackson-databind.version>2.12.4</jackson-databind.version>
17-
<junit-jupiter.version>5.8.0-RC1</junit-jupiter.version>
16+
<jackson-databind.version>2.13.0</jackson-databind.version>
17+
<junit-jupiter.version>5.8.2</junit-jupiter.version>
1818
</properties>
1919

2020
<dependencyManagement>

‎examples/calculator-java-testng/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.1.0-SNAPSHOT</version>
7+
<version>7.1.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java-testng</artifactId>

‎examples/calculator-java8-cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.cucumber</groupId>
66
<artifactId>cucumber-examples</artifactId>
7-
<version>7.1.0-SNAPSHOT</version>
7+
<version>7.1.1-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>calculator-java8-cli</artifactId>

0 commit comments

Comments
 (0)