Skip to content

Commit 3afe4b9

Browse files
mpkorstanjempkorstanje
authored
Update dependency io.cucumber:gherkin to v24 (#2600)
1 parent 250617a commit 3afe4b9

File tree

40 files changed

+76
-67
lines changed

40 files changed

+76
-67
lines changed

‎CHANGELOG.md

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

1212
## [Unreleased]
1313

14+
### Changed
15+
- [Core] Update dependency io.cucumber:messages to v19
16+
- [Core] Update dependency io.cucumber:gherkin to v24
17+
- [Core] Update dependency io.cucumber:html-formatter to v20
18+
1419
## [7.5.0] - 2022-07-28
1520
### Added
1621
- [OpenEJB] Added new module `jakarta-openejb`, which supports the jakarta.* namespace in TomEE 9.x ([#2583](https://github.com/cucumber/cucumber-jvm/pull/2583) R. Zowalla)

‎compatibility/pom.xml

+1-1
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.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎cucumber-archetype/pom.xml

+1-1
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.5.1-SNAPSHOT</version>
8+
<version>7.6.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>cucumber-archetype</artifactId>

‎cucumber-bom/pom.xml

+21-21
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.5.1-SNAPSHOT</version>
6+
<version>7.6.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<packaging>pom</packaging>
@@ -14,7 +14,7 @@
1414
<properties>
1515
<ci-environment.version>9.1.0</ci-environment.version>
1616
<cucumber-expressions.version>16.0.0</cucumber-expressions.version>
17-
<html-formatter.version>19.2.0</html-formatter.version>
17+
<html-formatter.version>20.0.0</html-formatter.version>
1818
<tag-expressions.version>4.1.0</tag-expressions.version>
1919
</properties>
2020

@@ -55,97 +55,97 @@
5555
<dependency>
5656
<groupId>io.cucumber</groupId>
5757
<artifactId>cucumber-cdi2</artifactId>
58-
<version>7.5.1-SNAPSHOT</version>
58+
<version>7.6.0-SNAPSHOT</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>io.cucumber</groupId>
6262
<artifactId>cucumber-core</artifactId>
63-
<version>7.5.1-SNAPSHOT</version>
63+
<version>7.6.0-SNAPSHOT</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>io.cucumber</groupId>
6767
<artifactId>datatable</artifactId>
68-
<version>7.5.1-SNAPSHOT</version>
68+
<version>7.6.0-SNAPSHOT</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>io.cucumber</groupId>
7272
<artifactId>datatable-matchers</artifactId>
73-
<version>7.5.1-SNAPSHOT</version>
73+
<version>7.6.0-SNAPSHOT</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>io.cucumber</groupId>
7777
<artifactId>cucumber-deltaspike</artifactId>
78-
<version>7.5.1-SNAPSHOT</version>
78+
<version>7.6.0-SNAPSHOT</version>
7979
</dependency>
8080
<dependency>
8181
<groupId>io.cucumber</groupId>
8282
<artifactId>docstring</artifactId>
83-
<version>7.5.1-SNAPSHOT</version>
83+
<version>7.6.0-SNAPSHOT</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>io.cucumber</groupId>
8787
<artifactId>cucumber-gherkin</artifactId>
88-
<version>7.5.1-SNAPSHOT</version>
88+
<version>7.6.0-SNAPSHOT</version>
8989
</dependency>
9090
<dependency>
9191
<groupId>io.cucumber</groupId>
9292
<artifactId>cucumber-gherkin-messages</artifactId>
93-
<version>7.5.1-SNAPSHOT</version>
93+
<version>7.6.0-SNAPSHOT</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>io.cucumber</groupId>
9797
<artifactId>cucumber-guice</artifactId>
98-
<version>7.5.1-SNAPSHOT</version>
98+
<version>7.6.0-SNAPSHOT</version>
9999
</dependency>
100100
<dependency>
101101
<groupId>io.cucumber</groupId>
102102
<artifactId>cucumber-jakarta-cdi</artifactId>
103-
<version>7.5.1-SNAPSHOT</version>
103+
<version>7.6.0-SNAPSHOT</version>
104104
</dependency>
105105
<dependency>
106106
<groupId>io.cucumber</groupId>
107107
<artifactId>cucumber-java</artifactId>
108-
<version>7.5.1-SNAPSHOT</version>
108+
<version>7.6.0-SNAPSHOT</version>
109109
</dependency>
110110
<dependency>
111111
<groupId>io.cucumber</groupId>
112112
<artifactId>cucumber-java8</artifactId>
113-
<version>7.5.1-SNAPSHOT</version>
113+
<version>7.6.0-SNAPSHOT</version>
114114
</dependency>
115115
<dependency>
116116
<groupId>io.cucumber</groupId>
117117
<artifactId>cucumber-junit</artifactId>
118-
<version>7.5.1-SNAPSHOT</version>
118+
<version>7.6.0-SNAPSHOT</version>
119119
</dependency>
120120
<dependency>
121121
<groupId>io.cucumber</groupId>
122122
<artifactId>cucumber-junit-platform-engine</artifactId>
123-
<version>7.5.1-SNAPSHOT</version>
123+
<version>7.6.0-SNAPSHOT</version>
124124
</dependency>
125125
<dependency>
126126
<groupId>io.cucumber</groupId>
127127
<artifactId>cucumber-openejb</artifactId>
128-
<version>7.5.1-SNAPSHOT</version>
128+
<version>7.6.0-SNAPSHOT</version>
129129
</dependency>
130130
<dependency>
131131
<groupId>io.cucumber</groupId>
132132
<artifactId>cucumber-picocontainer</artifactId>
133-
<version>7.5.1-SNAPSHOT</version>
133+
<version>7.6.0-SNAPSHOT</version>
134134
</dependency>
135135
<dependency>
136136
<groupId>io.cucumber</groupId>
137137
<artifactId>cucumber-plugin</artifactId>
138-
<version>7.5.1-SNAPSHOT</version>
138+
<version>7.6.0-SNAPSHOT</version>
139139
</dependency>
140140
<dependency>
141141
<groupId>io.cucumber</groupId>
142142
<artifactId>cucumber-spring</artifactId>
143-
<version>7.5.1-SNAPSHOT</version>
143+
<version>7.6.0-SNAPSHOT</version>
144144
</dependency>
145145
<dependency>
146146
<groupId>io.cucumber</groupId>
147147
<artifactId>cucumber-testng</artifactId>
148-
<version>7.5.1-SNAPSHOT</version>
148+
<version>7.6.0-SNAPSHOT</version>
149149
</dependency>
150150
</dependencies>
151151
</dependencyManagement>

‎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.5.1-SNAPSHOT</version>
17+
<version>7.6.0-SNAPSHOT</version>
1818
</parent>
1919

2020
<artifactId>cucumber-cdi2</artifactId>

‎cucumber-core/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-core</artifactId>

‎cucumber-core/src/main/java/io/cucumber/core/options/CommandlineOptionsParser.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.List;
2525
import java.util.Optional;
2626
import java.util.ResourceBundle;
27+
import java.util.Set;
2728
import java.util.function.Function;
2829
import java.util.regex.Pattern;
2930
import java.util.stream.Collectors;
@@ -199,15 +200,15 @@ private String removeArgFor(String arg, List<String> args) {
199200

200201
private byte printI18n(String language) {
201202
GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
202-
List<String> languages = dialectProvider.getLanguages();
203+
Set<String> languages = dialectProvider.getLanguages();
203204

204205
if (language.equalsIgnoreCase("help")) {
205206
if (language.equalsIgnoreCase("help")) {
206-
List<GherkinDialect> dialects = new ArrayList<>();
207-
for (String code : languages) {
208-
GherkinDialect dialect = dialectProvider.getDialect(code, null);
209-
dialects.add(dialect);
210-
}
207+
List<GherkinDialect> dialects = languages.stream()
208+
.map(dialectProvider::getDialect)
209+
.filter(Optional::isPresent)
210+
.map(Optional::get)
211+
.collect(Collectors.toList());
211212

212213
int widestLanguage = findWidest(dialects, GherkinDialect::getLanguage);
213214
int widestName = findWidest(dialects, GherkinDialect::getName);
@@ -220,7 +221,8 @@ private byte printI18n(String language) {
220221
}
221222
}
222223
if (languages.contains(language)) {
223-
return printKeywordsFor(dialectProvider.getDialect(language, null));
224+
dialectProvider.getDialect(language)
225+
.ifPresent(this::printKeywordsFor);
224226
}
225227

226228
out.println("Unrecognised ISO language code");

‎cucumber-deltaspike/pom.xml

+1-1
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.5.1-SNAPSHOT</version>
8+
<version>7.6.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>cucumber-deltaspike</artifactId>

‎cucumber-gherkin-messages/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<properties>

‎cucumber-gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ public Optional<Feature> parse(URI path, String source, Supplier<UUID> idGenerat
5656
cucumberQuery.update(feature);
5757
GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
5858
String language = feature.getLanguage();
59-
GherkinDialect dialect = dialectProvider.getDialect(language, null);
59+
GherkinDialect dialect = dialectProvider.getDialect(language)
60+
// Can't happen, we just parsed the feature.
61+
.orElseThrow(() -> new IllegalStateException(language + "was not a known gherkin Dialect"));
6062

6163
List<io.cucumber.messages.types.Pickle> pickleMessages = envelopes.stream()
6264
.map(Envelope::getPickle)

‎cucumber-gherkin/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<properties>

‎cucumber-guice/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-guice</artifactId>

‎cucumber-jakarta-cdi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>io.cucumber</groupId>
1818
<artifactId>cucumber-jvm</artifactId>
19-
<version>7.5.1-SNAPSHOT</version>
19+
<version>7.6.0-SNAPSHOT</version>
2020
</parent>
2121

2222
<artifactId>cucumber-jakarta-cdi</artifactId>

‎cucumber-jakarta-openejb/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-jakarta-openejb</artifactId>

‎cucumber-java/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-java</artifactId>

‎cucumber-java/src/main/groovy/generate-annotations.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def unsupported = ["em", "en_tx"] // The generated files for Emoij and Texan do
1616
GherkinDialectProvider dialectProvider = new GherkinDialectProvider()
1717

1818
dialectProvider.getLanguages().each { language ->
19-
def dialect = dialectProvider.getDialect(language, null)
19+
def dialect = dialectProvider.getDialect(language).get()
2020
def normalized_language = dialect.language.replaceAll("[\\s-]", "_").toLowerCase()
2121
if (!unsupported.contains(normalized_language)) {
2222
dialect.stepKeywords.findAll { !it.contains('*') && !it.matches("^\\d.*") }.unique().each { kw ->

‎cucumber-java8/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-java8</artifactId>

‎cucumber-java8/src/main/groovy/generate-interfaces.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def unsupported = ["em", "en_tx"] // The generated files for Emoij and Texan do
99
GherkinDialectProvider dialectProvider = new GherkinDialectProvider()
1010

1111
dialectProvider.getLanguages().each { language ->
12-
def dialect = dialectProvider.getDialect(language, null)
12+
def dialect = dialectProvider.getDialect(language).get()
1313
def normalized_language = dialect.language.replaceAll("[\\s-]", "_").toLowerCase()
1414
if (!unsupported.contains(normalized_language)) {
1515
def templateSource = new File(project.basedir, "src/main/groovy/lambda.java.gsp").getText()

‎cucumber-junit-platform-engine/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-junit-platform-engine</artifactId>

‎cucumber-junit/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-junit</artifactId>

‎cucumber-kotlin-java8/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-kotlin-java8</artifactId>

‎cucumber-openejb/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-openejb</artifactId>

‎cucumber-picocontainer/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-picocontainer</artifactId>

‎cucumber-plugin/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-plugin</artifactId>

‎cucumber-spring/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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-spring</artifactId>

‎cucumber-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-jvm</artifactId>
7-
<version>7.5.1-SNAPSHOT</version>
7+
<version>7.6.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>cucumber-testng</artifactId>

0 commit comments

Comments
 (0)