Update junit5 monorepo to v5.9.0 (#2590)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: M.P. Korstanje <rien.korstanje@gmail.com>
cucumber · Jul 27, 2022 · 4f0cc30 · 4f0cc30
1 parent de5c2b8
commit 4f0cc30
Show file tree

Hide file tree

Showing 53 changed files with 165 additions and 86 deletions.
diff --git a/.revapi/api-changes.json b/.revapi/api-changes.json
@@ -338,5 +338,30 @@
  ]
  }
  }
+ ],
+ "junit5": [
+ {
+ "extension": "revapi.differences",
+ "id": "junit5-api-issues",
+ "ignore": true,
+ "configuration": {
+ "differences": [
+ {
+ "ignore": true,
+ "code": "java.method.addedToInterface",
+ "new": "method java.util.Set<java.lang.String> org.junit.platform.engine.ConfigurationParameters::keySet()",
+ "justification": "API consumed from JUnit 5"
+ },
+ {
+ "ignore": true,
+ "code": "java.annotation.added",
+ "old": "method int org.junit.platform.engine.ConfigurationParameters::size()",
+ "new": "method int org.junit.platform.engine.ConfigurationParameters::size()",
+ "annotation": "@org.apiguardian.api.API(status = org.apiguardian.api.API.Status.DEPRECATED, since = \"1.9\")",
+ "justification": "API consumed from JUnit 5"
+ }
+ ]
+ }
+ }
  ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,18 +12,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * [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) 
 
 ### Changed
+* [JUnit Platform] Use JUnit Platform 1.9.0 (JUnit Jupiter 5.9.0) ([#2590](https://github.com/cucumber/cucumber-jvm/pull/2590) M.P. Korstanje)
 
 ### Deprecated
 
 ### Removed
 
 ### Fixed
- - [Java] Process glue classes distinctly ([#2582](https://github.com/cucumber/cucumber-jvm/pull/2582) M.P. Korstanje)
+* [Java] Process glue classes distinctly ([#2582](https://github.com/cucumber/cucumber-jvm/pull/2582) M.P. Korstanje)
 
 ## [7.4.1] (2022-06-23)
 
 ### Fixed
- * [Core] Fix NoSuchMethodError `PrintWriter(OutputStream, boolean, Charset)` ([#2578](https://github.com/cucumber/cucumber-jvm/pull/2578) M.P. Korstanje)
+* [Core] Fix NoSuchMethodError `PrintWriter(OutputStream, boolean, Charset)` ([#2578](https://github.com/cucumber/cucumber-jvm/pull/2578) M.P. Korstanje)
 
 ## [7.4.0] (2022-06-22)
 

diff --git a/archetype/pom.xml b/archetype/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-jvm</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>cucumber-archetype</artifactId>
@@ -14,7 +14,7 @@
  <description>Cucumber JVM: Maven Archetype</description>
 
  <properties>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version>
  </properties>
 
  <!-- Not used by this module, but used by the integration tests of

diff --git a/archetype/src/main/resources/archetype-resources/src/test/java/StepDefinitions.java b/archetype/src/main/resources/archetype-resources/src/test/java/StepDefinitions.java
@@ -1,11 +1,21 @@
 package ${package};
 
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
+import io.cucumber.java.en.*;
 
 import org.junit.jupiter.api.Assertions.*;
 
 public class StepDefinitions {
 
+ @Given("an example scenario")
+ public void anExampleScenario() {
+ }
+
+ @When("all step definitions are implemented")
+ public void allStepDefinitionsAreImplemented() {
+ }
+
+ @Then("the scenario passes")
+ public void theScenarioPasses() {
+ }
+
 }
diff --git a/...rc/main/resources/archetype-resources/src/test/resources/__packageInPathFormat__/.gitkeep b/...rc/main/resources/archetype-resources/src/test/resources/__packageInPathFormat__/.gitkeep
diff --git a/.../resources/archetype-resources/src/test/resources/__packageInPathFormat__/example.feature b/.../resources/archetype-resources/src/test/resources/__packageInPathFormat__/example.feature
@@ -0,0 +1,6 @@
+Feature: An example
+
+ Scenario: The example
+ Given an example scenario
+ When all step definitions are implemented
+ Then the scenario passes
diff --git a/...projects/should-generate-project/reference/src/test/java/com/example/StepDefinitions.java b/...projects/should-generate-project/reference/src/test/java/com/example/StepDefinitions.java
@@ -1,11 +1,21 @@
 package com.example;
 
-import io.cucumber.java.en.Given;
-import io.cucumber.java.en.Then;
-import io.cucumber.java.en.When;
+import io.cucumber.java.en.*;
 
 import org.junit.jupiter.api.Assertions.*;
 
 public class StepDefinitions {
 
+ @Given("an example scenario")
+ public void anExampleScenario() {
+ }
+
+ @When("all step definitions are implemented")
+ public void allStepDefinitionsAreImplemented() {
+ }
+
+ @Then("the scenario passes")
+ public void theScenarioPasses() {
+ }
+
 }
diff --git a/...ources/projects/should-generate-project/reference/src/test/resources/com/example/.gitkeep b/...ources/projects/should-generate-project/reference/src/test/resources/com/example/.gitkeep
diff --git a/...projects/should-generate-project/reference/src/test/resources/com/example/example.feature b/...projects/should-generate-project/reference/src/test/resources/com/example/example.feature
@@ -0,0 +1,6 @@
+Feature: An example
+
+ Scenario: The example
+ Given an example scenario
+ When all step definitions are implemented
+ Then the scenario passes
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>cucumber-jvm</artifactId>
  <groupId>io.cucumber</groupId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <packaging>pom</packaging>
@@ -55,97 +55,97 @@
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-cdi2</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-core</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>datatable</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>datatable-matchers</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-deltaspike</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>docstring</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-gherkin</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-gherkin-messages</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-guice</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-jakarta-cdi</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-java</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-java8</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-junit</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-junit-platform-engine</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-openejb</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-picocontainer</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-plugin</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-spring</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  <dependency>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-testng</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </dependency>
  </dependencies>
  </dependencyManagement>

diff --git a/cdi2/pom.xml b/cdi2/pom.xml
@@ -7,14 +7,14 @@
  <openwebbeans.version>2.0.27</openwebbeans.version>
  <weld-se-core.version>3.1.9.Final</weld-se-core.version>
  <apiguardian-api.version>1.1.2</apiguardian-api.version>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version>
  <hamcrest.version>2.2</hamcrest.version>
  </properties>
 
  <parent>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-jvm</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>cucumber-cdi2</artifactId>

diff --git a/cdi2/src/test/java/io/cucumber/cdi2/example/RunCucumberTest.java b/cdi2/src/test/java/io/cucumber/cdi2/example/RunCucumberTest.java
@@ -1,9 +1,11 @@
 package io.cucumber.cdi2.example;
 
 import org.junit.platform.suite.api.IncludeEngines;
+import org.junit.platform.suite.api.SelectClasspathResource;
 import org.junit.platform.suite.api.Suite;
 
 @Suite
 @IncludeEngines("cucumber")
+@SelectClasspathResource("io/cucumber/cdi2/example")
 public class RunCucumberTest {
 }
diff --git a/compatibility/pom.xml b/compatibility/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <artifactId>cucumber-jvm</artifactId>
  <groupId>io.cucumber</groupId>
- <version>7.4.1</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
@@ -12,7 +12,7 @@
 
  <properties>
  <hamcrest.version>2.2</hamcrest.version>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version>
  </properties>
 
  <dependencyManagement>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-jvm</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>cucumber-core</artifactId>
@@ -16,7 +16,7 @@
  <apiguardian-api.version>1.1.2</apiguardian-api.version>
  <jackson-databind.version>2.13.3</jackson-databind.version>
  <jsoup.version>1.15.2</jsoup.version>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version>
  <xmlunit.version>2.9.0</xmlunit.version>
  <hamcrest.version>2.2</hamcrest.version>
  <hamcrest-json.version>0.2</hamcrest-json.version>

diff --git a/core/src/test/java/io/cucumber/core/feature/GluePathTest.java b/core/src/test/java/io/cucumber/core/feature/GluePathTest.java
@@ -128,7 +128,9 @@ void absolute_windows_path_form_is_not_valid() {
 
  @ParameterizedTest
  @MethodSource("warn_when_glue_as_filesystem_path_examples")
- void when_when_glue_path_is_well_known_source_directory(String gluePath, Matcher<String> logPattern, LogRecordListener logRecordListener) {
+ void when_when_glue_path_is_well_known_source_directory(
+ String gluePath, Matcher<String> logPattern, LogRecordListener logRecordListener
+ ) {
  // warn when 'src/{test,main}/{java,kotlin,scala,groovy}' is used
 
  GluePath.parse(gluePath);

diff --git a/datatable-matchers/pom.xml b/datatable-matchers/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-jvm</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>datatable-matchers</artifactId>
@@ -17,7 +17,7 @@
  <apiguardian-api.version>1.1.2</apiguardian-api.version>
  <guava.version>31.1-jre</guava.version>
  <hamcrest.version>2.2</hamcrest.version>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version>
  </properties>
 
  <dependencyManagement>

diff --git a/datatable/pom.xml b/datatable/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-jvm</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>datatable</artifactId>
@@ -19,7 +19,7 @@
  <guava.version>31.1-jre</guava.version>
  <hamcrest.version>2.2</hamcrest.version>
  <jackson-databind.version>2.13.3</jackson-databind.version>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version>
  <mockito.version>4.6.1</mockito.version>
  </properties>
 

diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>io.cucumber</groupId>
  <artifactId>cucumber-jvm</artifactId>
- <version>7.4.2-SNAPSHOT</version>
+ <version>7.5.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>cucumber-deltaspike</artifactId>
@@ -16,7 +16,7 @@
  <apiguardian-api.version>1.1.2</apiguardian-api.version>
  <cdi-api.version>1.2</cdi-api.version>
  <deltaspike.version>1.9.6</deltaspike.version>
- <junit-jupiter.version>5.8.2</junit-jupiter.version>
+ <junit-jupiter.version>5.9.0</junit-jupiter.version>
  <project.Automatic-Module-Name>io.cucumber.deltaspike</project.Automatic-Module-Name>
  </properties>