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

Author: Julien Kronegg

.github/workflows/release-github.yml

@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - 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@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         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@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -40,7 +40,7 @@ jobs:
     name: 'Javadoc'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -55,7 +55,7 @@ jobs:
     name: 'Coverage'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -75,7 +75,7 @@ jobs:
     name: 'Semver'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
+distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

CHANGELOG.md

@@ -11,6 +11,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [7.14.0] - 2023-09-09
+### Changed
+- [Core] Update dependency io.cucumber:html-formatter to v20.4.0
+- [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)
+
+### Fixed
+- [Core] Exclude Multi-Release files from Jackson while shading ([#2786](https://github.com/cucumber/cucumber-jvm/pull/2786) M.P. Korstanje)
+
 ## [7.13.0] - 2023-07-02
 ### Changed
 - [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
 - [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.13.0...main
-[7.13.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.1...main
-[7.12.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.0...main
-[7.12.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.2...main
-[7.11.2]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...main
-[7.11.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.0...main
+[Unreleased]: https://github.com/cucumber/cucumber-jvm/compare/v7.14.0...HEAD
+[7.14.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.13.0...v7.14.0
+[7.13.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.1...v7.13.0
+[7.12.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.12.0...v7.12.1
+[7.12.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.2...v7.12.0
+[7.11.2]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.1...v7.11.2
+[7.11.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.11.0...v7.11.1
 [7.11.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.10.1...v7.11.0
 [7.10.1]: https://github.com/cucumber/cucumber-jvm/compare/v7.10.0...v7.10.1
 [7.10.0]: https://github.com/cucumber/cucumber-jvm/compare/v7.9.0...v7.10.0

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 We appreciate that. Do keep the following in mind: 
 
-* Before making significant contribution consider discussing the outline of 
+* Before making a significant contribution, consider discussing the outline of 
   your solution first. This may avoid a duplication of efforts.
 * When you send a [pull requests](https://help.github.com/articles/using-pull-requests), 
   please include tests to go along with it.
@@ -25,7 +25,7 @@ When building the project for the first time, run:
 The `cucumber-archetype` modules integration tests against `-SNAPSHOT` 
 versions of Cucumber. These must be installed first.
 
-Afterwards `./mvnw test` or `./mvnw verify` should work as expected.
+Afterward `./mvnw test` or `./mvnw verify` should work as expected.
 
 ## Formatting Java
 

README.md

@@ -22,7 +22,7 @@ Cucumber-JVM also integrates with all the popular
 
 ## Upgrading?
 
-Migration instructions from previous major version and a long form
+Migration instructions from previous major versions and a long form
 explanation of noteworthy changes can be found in the [release-notes archive](release-notes)
 
 The changes for the current major version can be found in the [CHANGELOG.md](CHANGELOG.md).

compatibility/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cucumber-jvm</artifactId>
         <groupId>io.cucumber</groupId>
-        <version>7.14.0-SNAPSHOT</version>
+        <version>7.14.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -13,7 +13,7 @@
 
     <properties>
         <hamcrest.version>2.2</hamcrest.version>
-        <jackson.version>2.15.2</jackson.version>
+        <jackson.version>2.15.3</jackson.version>
         <junit-jupiter.version>5.10.0</junit-jupiter.version>
     </properties>
 

cucumber-archetype/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm</artifactId>
-        <version>7.14.0-SNAPSHOT</version>
+        <version>7.14.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-archetype</artifactId>

cucumber-bom/README.md

@@ -1,7 +1,7 @@
 # Bill of Materials
 
 It is fairly common for one project to use more than one Cucumber dependency. To
-keep these version in sync a Bill of Materials can be used.
+keep these versions in sync, a Bill of Materials can be used.
 
 ## Usage