Update dependency io.cucumber:gherkin to v24 (#2600)

cucumber · Aug 7, 2022 · 3afe4b9 · 3afe4b9
1 parent 250617a
commit 3afe4b9
Show file tree

Hide file tree

Showing 40 changed files with 76 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- [Core] Update dependency io.cucumber:messages to v19
+- [Core] Update dependency io.cucumber:gherkin to v24
+- [Core] Update dependency io.cucumber:html-formatter to v20
+
 ## [7.5.0] - 2022-07-28
 ### Added
 - [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)

diff --git a/compatibility/pom.xml b/compatibility/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cucumber-jvm</artifactId>
         <groupId>io.cucumber</groupId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/cucumber-archetype/pom.xml b/cucumber-archetype/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-archetype</artifactId>

diff --git a/cucumber-bom/pom.xml b/cucumber-bom/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cucumber-jvm</artifactId>
         <groupId>io.cucumber</groupId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -14,7 +14,7 @@
     <properties>
         <ci-environment.version>9.1.0</ci-environment.version>
         <cucumber-expressions.version>16.0.0</cucumber-expressions.version>
-        <html-formatter.version>19.2.0</html-formatter.version>
+        <html-formatter.version>20.0.0</html-formatter.version>
         <tag-expressions.version>4.1.0</tag-expressions.version>
     </properties>
 
@@ -55,97 +55,97 @@
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-cdi2</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-core</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>datatable</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>datatable-matchers</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-deltaspike</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>docstring</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-gherkin</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-gherkin-messages</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-guice</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-jakarta-cdi</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-java</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-java8</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-junit</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-junit-platform-engine</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-openejb</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-picocontainer</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-plugin</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-spring</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-testng</artifactId>
-                <version>7.5.1-SNAPSHOT</version>
+                <version>7.6.0-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/cucumber-cdi2/pom.xml b/cucumber-cdi2/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-cdi2</artifactId>

diff --git a/cucumber-core/pom.xml b/cucumber-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-core</artifactId>

diff --git a/cucumber-core/src/main/java/io/cucumber/core/options/CommandlineOptionsParser.java b/cucumber-core/src/main/java/io/cucumber/core/options/CommandlineOptionsParser.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -199,15 +200,15 @@ private String removeArgFor(String arg, List<String> args) {
 
     private byte printI18n(String language) {
         GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
-        List<String> languages = dialectProvider.getLanguages();
+        Set<String> languages = dialectProvider.getLanguages();
 
         if (language.equalsIgnoreCase("help")) {
             if (language.equalsIgnoreCase("help")) {
-                List<GherkinDialect> dialects = new ArrayList<>();
-                for (String code : languages) {
-                    GherkinDialect dialect = dialectProvider.getDialect(code, null);
-                    dialects.add(dialect);
-                }
+                List<GherkinDialect> dialects = languages.stream()
+                        .map(dialectProvider::getDialect)
+                        .filter(Optional::isPresent)
+                        .map(Optional::get)
+                        .collect(Collectors.toList());
 
                 int widestLanguage = findWidest(dialects, GherkinDialect::getLanguage);
                 int widestName = findWidest(dialects, GherkinDialect::getName);
@@ -220,7 +221,8 @@ private byte printI18n(String language) {
             }
         }
         if (languages.contains(language)) {
-            return printKeywordsFor(dialectProvider.getDialect(language, null));
+            dialectProvider.getDialect(language)
+                    .ifPresent(this::printKeywordsFor);
         }
 
         out.println("Unrecognised ISO language code");

diff --git a/cucumber-deltaspike/pom.xml b/cucumber-deltaspike/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-deltaspike</artifactId>

diff --git a/cucumber-gherkin-messages/pom.xml b/cucumber-gherkin-messages/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/...essages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java b/...essages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java
@@ -56,7 +56,9 @@ public Optional<Feature> parse(URI path, String source, Supplier<UUID> idGenerat
                     cucumberQuery.update(feature);
                     GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
                     String language = feature.getLanguage();
-                    GherkinDialect dialect = dialectProvider.getDialect(language, null);
+                    GherkinDialect dialect = dialectProvider.getDialect(language)
+                            // Can't happen, we just parsed the feature.
+                            .orElseThrow(() -> new IllegalStateException(language + "was not a known gherkin Dialect"));
 
                     List<io.cucumber.messages.types.Pickle> pickleMessages = envelopes.stream()
                             .map(Envelope::getPickle)

diff --git a/cucumber-gherkin/pom.xml b/cucumber-gherkin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/cucumber-guice/pom.xml b/cucumber-guice/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-guice</artifactId>

diff --git a/cucumber-jakarta-cdi/pom.xml b/cucumber-jakarta-cdi/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-jakarta-cdi</artifactId>

diff --git a/cucumber-jakarta-openejb/pom.xml b/cucumber-jakarta-openejb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-jakarta-openejb</artifactId>

diff --git a/cucumber-java/pom.xml b/cucumber-java/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-java</artifactId>

diff --git a/cucumber-java/src/main/groovy/generate-annotations.groovy b/cucumber-java/src/main/groovy/generate-annotations.groovy
@@ -16,7 +16,7 @@ def unsupported = ["em", "en_tx"] // The generated files for Emoij and Texan do
 GherkinDialectProvider dialectProvider = new GherkinDialectProvider()
 
 dialectProvider.getLanguages().each { language ->
-    def dialect = dialectProvider.getDialect(language, null)
+    def dialect = dialectProvider.getDialect(language).get()
     def normalized_language = dialect.language.replaceAll("[\\s-]", "_").toLowerCase()
     if (!unsupported.contains(normalized_language)) {
         dialect.stepKeywords.findAll { !it.contains('*') && !it.matches("^\\d.*") }.unique().each { kw ->

diff --git a/cucumber-java8/pom.xml b/cucumber-java8/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-java8</artifactId>

diff --git a/cucumber-java8/src/main/groovy/generate-interfaces.groovy b/cucumber-java8/src/main/groovy/generate-interfaces.groovy
@@ -9,7 +9,7 @@ def unsupported = ["em", "en_tx"] // The generated files for Emoij and Texan do
 GherkinDialectProvider dialectProvider = new GherkinDialectProvider()
 
 dialectProvider.getLanguages().each { language ->
-    def dialect = dialectProvider.getDialect(language, null)
+    def dialect = dialectProvider.getDialect(language).get()
     def normalized_language = dialect.language.replaceAll("[\\s-]", "_").toLowerCase()
     if (!unsupported.contains(normalized_language)) {
         def templateSource = new File(project.basedir, "src/main/groovy/lambda.java.gsp").getText()

diff --git a/cucumber-junit-platform-engine/pom.xml b/cucumber-junit-platform-engine/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-junit-platform-engine</artifactId>

diff --git a/cucumber-junit/pom.xml b/cucumber-junit/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-junit</artifactId>

diff --git a/cucumber-kotlin-java8/pom.xml b/cucumber-kotlin-java8/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-kotlin-java8</artifactId>

diff --git a/cucumber-openejb/pom.xml b/cucumber-openejb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-openejb</artifactId>

diff --git a/cucumber-picocontainer/pom.xml b/cucumber-picocontainer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-picocontainer</artifactId>

diff --git a/cucumber-plugin/pom.xml b/cucumber-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-plugin</artifactId>

diff --git a/cucumber-spring/pom.xml b/cucumber-spring/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-spring</artifactId>

diff --git a/cucumber-testng/pom.xml b/cucumber-testng/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.5.1-SNAPSHOT</version>
+        <version>7.6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-testng</artifactId>