Merge remote-tracking branch 'origin/main' into message-based-progress-and-rerun

Author: mpkorstanje

.github/workflows/release-github.yml

@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: cucumber/[email protected]
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-java.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: Release
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'

.github/workflows/test-java.yml

@@ -23,7 +23,7 @@ jobs:
     name: 'Build Java ${{ matrix.version }} - ${{ matrix.os }}'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
@@ -38,7 +38,7 @@ jobs:
     name: 'Javadoc'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
@@ -53,7 +53,7 @@ jobs:
     name: 'Semver'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'

.github/workflows/test-testdata.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - uses: actions/setup-node@v4
       with:

CHANGELOG.md

@@ -10,6 +10,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- [Core] Format time in JUnit XML report as `xs:float` ([junit-xml-formatter/#83](https://github.com/cucumber/junit-xml-formatter/pull/83) M.P. Korstanje)
+- [Core] Replace concurrent hashmap with regular hashmap ([query/#89](https://github.com/cucumber/query/pull/89) M.P. Korstanje)
+
+## [7.27.0] - 2025-07-27
+### Changed
+- [Core] Show both steps and hooks in progress formatter ([#3029](https://github.com/cucumber/cucumber-jvm/pull/3029) M.P. Korstanje)
+- [Core] Use a more consistent definition of whitespace ([gherkin/#442](https://github.com/cucumber/gherkin/pull/442) M.P. Korstanje)
+- [Core] Improve Gherkin parser performance ([gherkin/#436](https://github.com/cucumber/gherkin/pull/436) Julien Kronegg,  M.P. Korstanje)
 
 ## [7.26.0] - 2025-07-14
 ### Added
@@ -18,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - [JUnit Platform Engine] Don't use Java 9+ APIs ([#3025](https://github.com/cucumber/cucumber-jvm/pull/3025) M.P. Korstanje)
 - [JUnit Platform Engine] Implement toString on custom DiscoverySelectors
-[Core] Fix incomplete id for scenarios under rules in json output ([#3026](https://github.com/cucumber/cucumber-jvm/pull/3026) M.P. Korstanje)
+- [Core] Fix incomplete id for scenarios under rules in json output ([#3026](https://github.com/cucumber/cucumber-jvm/pull/3026) M.P. Korstanje)
 
 ## [7.25.0] - 2025-07-10
 ### Changed
@@ -447,7 +456,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [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)
 - [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)
 
-[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.26.0...HEAD
+[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.27.0...HEAD
+[7.27.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.26.0...v7.27.0
 [7.26.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.25.0...v7.26.0
 [7.25.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.24.0...v7.25.0
 [7.24.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.23.0...v7.24.0

compatibility/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cucumber-jvm</artifactId>
         <groupId>io.cucumber</groupId>
-        <version>7.26.1-SNAPSHOT</version>
+        <version>7.27.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,8 +13,8 @@
 
     <properties>
         <hamcrest.version>3.0</hamcrest.version>
-        <jackson.version>2.19.1</jackson.version>
-        <junit-jupiter.version>5.13.3</junit-jupiter.version>
+        <jackson.version>2.19.2</jackson.version>
+        <junit-jupiter.version>5.13.4</junit-jupiter.version>
         <project.Automatic-Module-Name>io.cucumber.compatibility</project.Automatic-Module-Name>
     </properties>
 

compatibility/src/test/java/io/cucumber/compatibility/CompatibilityTest.java

@@ -43,14 +43,17 @@ void produces_expected_output_for(TestCase testCase) throws IOException {
             Runtime.builder()
                     .withRuntimeOptions(new RuntimeOptionsBuilder()
                             .addGlue(testCase.getGlue())
-                            .addFeature(testCase.getFeature())
-                            .build())
+                            .addFeature(testCase.getFeatures()).build())
                     .withAdditionalPlugins(
                         new MessageFormatter(newOutputStream(outputNdjson)))
                     .build()
                     .run();
-        } catch (Exception ignored) {
-
+        } catch (Exception e) {
+            // exception: Scenario with unknown parameter types fails by
+            // throwing an exceptions
+            if (!"unknown-parameter-type".equals(testCase.getId())) {
+                throw e;
+            }
         }
 
         // exception: Cucumber JVM does not support named hooks

compatibility/src/test/java/io/cucumber/compatibility/TestCase.java

@@ -19,11 +19,9 @@ final class TestCase {
     private static final String FEATURES_DIRECTORY = "src/test/resources/features";
     private static final String FEATURES_PACKAGE = "io.cucumber.compatibility";
 
-    private final String packageName;
     private final String id;
 
-    private TestCase(String packageName, String id) {
-        this.packageName = packageName;
+    private TestCase(String id) {
         this.id = id;
     }
 
@@ -33,8 +31,7 @@ static List<TestCase> testCases() throws IOException {
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
             for (Path path : stream) {
                 if (path.toFile().isDirectory()) {
-                    String id = path.getFileName().toString();
-                    testCases.add(new TestCase(id.replace("-", ""), id));
+                    testCases.add(new TestCase(path.getFileName().toString()));
                 }
             }
         }
@@ -47,15 +44,15 @@ String getId() {
     }
 
     URI getGlue() {
-        return GluePath.parse(FEATURES_PACKAGE + "." + packageName);
+        return GluePath.parse(FEATURES_PACKAGE + "." + id.replace("-", ""));
     }
 
-    FeatureWithLines getFeature() {
-        return FeatureWithLines.parse("file:" + FEATURES_DIRECTORY + "/" + id + "/" + id + ".feature");
+    FeatureWithLines getFeatures() {
+        return FeatureWithLines.parse("file:" + FEATURES_DIRECTORY + "/" + id);
     }
 
     Path getExpectedFile() {
-        return Paths.get(FEATURES_DIRECTORY + "/" + id + "/" + id + ".feature.ndjson");
+        return Paths.get(FEATURES_DIRECTORY + "/" + id + "/" + id + ".ndjson");
     }
 
     @Override

compatibility/src/test/java/io/cucumber/compatibility/attachments/Attachments.java

@@ -48,22 +48,6 @@ public void anArrayWithBytesAreAttachedAs(int n, String mediaType) {
         scenario.attach(bytes, mediaType, null);
     }
 
-    @When("a JPEG image is attached")
-    public void aJPEGImageIsAttached() throws IOException {
-        Path path = Paths.get("src/test/resources/features/attachments/cucumber.jpeg");
-        byte[] bytes = Files.readAllBytes(path);
-        String fileName = path.getFileName().toString();
-        scenario.attach(bytes, "image/jpeg", fileName);
-    }
-
-    @When("a PNG image is attached")
-    public void aPNGImageIsAttached() throws IOException {
-        Path path = Paths.get("src/test/resources/features/attachments/cucumber.png");
-        byte[] bytes = Files.readAllBytes(path);
-        String fileName = path.getFileName().toString();
-        scenario.attach(bytes, "image/png", fileName);
-    }
-
     @When("a PDF document is attached and renamed")
     public void aPDFDocumentIsAttachedAndRenamed() throws IOException {
         Path path = Paths.get("src/test/resources/features/attachments/document.pdf");

compatibility/src/test/resources/features/attachments/attachments.feature

@@ -1,13 +1,12 @@
 Feature: Attachments
-  It is sometimes useful to take a screenshot while a scenario runs.
-  Or capture some logs.
+  It is sometimes useful to take a screenshot while a scenario runs or capture some logs.
 
   Cucumber lets you `attach` arbitrary files during execution, and you can
   specify a content type for the contents.
 
   Formatters can then render these attachments in reports.
 
-  Attachments must have a body and a content type
+  Attachments must have a body and a content type.
 
   Scenario: Strings can be attached with a media type
     Beware that some formatters such as @cucumber/react use the media type
@@ -30,12 +29,6 @@ Feature: Attachments
   Scenario: Byte arrays are base64-encoded regardless of media type
     When an array with 10 bytes is attached as "text/plain"
 
-  Scenario: Attaching JPEG images
-    When a JPEG image is attached
-
-  Scenario: Attaching PNG images
-    When a PNG image is attached
-
   Scenario: Attaching PDFs with a different filename
     When a PDF document is attached and renamed