Update to latest groovy and cucumber jvm

CHANGELOG.md

@@ -12,6 +12,10 @@ See also the [CHANGELOG](https://github.com/cucumber/cucumber-jvm/blob/main/CHAN
 ### Added
 
 ### Changed
+* Upgrade to latest groovy version 4.0.11 and cucumber-jvm 7.11.2 
+* Upgrading to Surefire v3 so we can use JUnit 5.
+* Using Bills of Material to keep all the dependencies aligned (and remove all the explicit version numbers everywhere)
+* Replacing JUnit 4 with JUnit 5.
 
 ### Deprecated
 

examples/pom.xml

@@ -4,54 +4,53 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm-groovy</artifactId>
-        <version>6.10.5-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>groovy-examples</artifactId>
     <packaging>jar</packaging>
     <name>Cucumber Groovy Examples</name>
 
-    <properties>
-        <gmaven.runtime>1.8</gmaven.runtime>
-        <junit-jupiter.version>5.6.0</junit-jupiter.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-groovy</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit</artifactId>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-suite</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-junit-platform-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
         <plugin>
-            <groupId>org.codehaus.gmaven</groupId>
-            <artifactId>gmaven-plugin</artifactId>
+            <groupId>org.codehaus.gmavenplus</groupId>
+            <artifactId>gmavenplus-plugin</artifactId>
             <executions>
                 <execution>
                     <goals>
                         <goal>generateStubs</goal>
                         <goal>compile</goal>
                         <goal>generateTestStubs</goal>
-                        <goal>testCompile</goal>
+                        <goal>compileTests</goal>
                     </goals>
                 </execution>
             </executions>

examples/src/test/groovy/calc/CalculatorSteps.groovy

@@ -51,11 +51,6 @@ Given(~/^I have entered (\d+) into .* calculator$/) { int number ->
     calc.push number
 }
 
-// Remember to still include "->" if there are no parameters.
-Given(~/\d+ into the/) {->
-    throw new RuntimeException("should never get here since we're running with --guess")
-}
-
 // This step calls a Calculator function specified in the step
 // and saves the result in the current world object.
 When(~/^I press (\w+)$/) { String opname ->

examples/src/test/java/calc/RunCukesTest.java

@@ -1,11 +1,16 @@
 package calc;
 
 
-import io.cucumber.junit.Cucumber;
-import io.cucumber.junit.CucumberOptions;
-import org.junit.runner.RunWith;
+import org.junit.platform.suite.api.ConfigurationParameter;
+import org.junit.platform.suite.api.IncludeEngines;
+import org.junit.platform.suite.api.SelectClasspathResource;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Cucumber.class)
-@CucumberOptions(glue = {"calc"} )
+import static io.cucumber.core.options.Constants.GLUE_PROPERTY_NAME;
+
+@Suite
+@IncludeEngines("cucumber")
+@SelectClasspathResource("calc")
+@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "calc")
 public class RunCukesTest {
 }

examples/src/test/resources/junit-platform.properties

@@ -0,0 +1 @@
+cucumber.publish.quiet=true

groovy/pom.xml

@@ -4,57 +4,87 @@
     <parent>
         <groupId>io.cucumber</groupId>
         <artifactId>cucumber-jvm-groovy</artifactId>
-        <version>6.10.5-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-groovy</artifactId>
     <packaging>jar</packaging>
     <name>Cucumber Groovy</name>
 
     <properties>
-        <gmaven.runtime>1.8</gmaven.runtime>
         <jackson.version>2.14.2</jackson.version>
-        <junit-jupiter.version>5.9.2</junit-jupiter.version>
+        <mockito.version>5.3.1</mockito.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-bom</artifactId>
+                <version>${mockito.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.groovy</groupId>
+            <artifactId>groovy-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>${junit-jupiter.version}</version>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-suite</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-junit-platform-engine</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.auto.service</groupId>
             <artifactId>auto-service</artifactId>
@@ -67,7 +97,6 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
-                <version>2.1.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -167,14 +196,12 @@
                                 <echo message="Running groovy tests via the CLI..." />
                                 <java classname="groovy.ui.GroovyMain" fork="true" failonerror="true" newenvironment="true" maxmemory="512m" classpathref="maven.test.classpath">
                                     <classpath>
-                                        <pathelement location="${maven.dependency.org.codehaus.groovy.groovy-all.jar.path}" />
+                                        <pathelement location="${maven.dependency.org.apache.groovy.groovy-ant.jar.path}" />
                                         <pathelement location="${maven.dependency.junit.junit.jar.path}" />
                                         <pathelement location="${basedir}/bin/cucumber-groovy-shaded.jar" />
                                         <pathelement location="target/test-classes" />
                                     </classpath>
                                     <arg value="bin/cucumber-jvm.groovy" />
-                                    <arg value="--strict" />
-
                                     <!--
                                     target/test-classes/cucumber/runtime/groovy contains:
 

groovy/src/main/groovy/I18n.groovy.gsp

@@ -8,24 +8,24 @@ import java.util.regex.Pattern;
 public class ${normalized_language} {
 <% i18n.stepKeywords.findAll { !it.contains('*') && !it.matches("^\\d.*") }.unique().each { kw -> %>
 
-    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!]", ""), java.text.Normalizer.Form.NFC)}(String[] expressions, Closure body) throws Throwable {
+    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!\u2019]", ""), java.text.Normalizer.Form.NFC)}(String[] expressions, Closure body) throws Throwable {
         Arrays.stream(expressions).forEach(expression->
               GroovyBackend.getInstance().addStepDefinition(expression, body)
         );
     }
 
-    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!]", ""), java.text.Normalizer.Form.NFC)}(Pattern[] regexps, Closure body) throws Throwable {
+    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!\u2019]", ""), java.text.Normalizer.Form.NFC)}(Pattern[] regexps, Closure body) throws Throwable {
          Arrays.stream(regexps).forEach(regexp->
-               GroovyBackend.getInstance().addStepDefinition(regexp.toString(), body)
+               GroovyBackend.getInstance().addStepDefinition("/" + regexp.toString() + "/", body)
          );
     }
 
-    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!]", ""), java.text.Normalizer.Form.NFC)}(String expression, Closure body) throws Throwable {
+    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!\u2019]", ""), java.text.Normalizer.Form.NFC)}(String expression, Closure body) throws Throwable {
         GroovyBackend.getInstance().addStepDefinition(expression, body);
     }
 
-    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!]", ""), java.text.Normalizer.Form.NFC)}(Pattern regexp, Closure body) throws Throwable {
-        GroovyBackend.getInstance().addStepDefinition(regexp.toString(), body);
+    public static void ${java.text.Normalizer.normalize(kw.replaceAll("[\\s',!\u2019]", ""), java.text.Normalizer.Form.NFC)}(Pattern regexp, Closure body) throws Throwable {
+        GroovyBackend.getInstance().addStepDefinition("/" + regexp.toString() + "/", body);
     }
 <% } %>
 }

groovy/src/main/groovy/generate-keywords.groovy

@@ -8,7 +8,7 @@ def unsupported = ["EM"] // The generated files for Emoij do not compile.
 def dialectProvider = new GherkinDialectProvider()
 
 dialectProvider.getLanguages().each { language ->
-    def dialect = dialectProvider.getDialect(language, null)
+    def dialect = dialectProvider.getDialect(language).orElseThrow()
     def normalized_language = dialect.language.replaceAll("[\\s-]", "_").toUpperCase()
     if (!unsupported.contains(normalized_language)) {
         def binding = ["i18n":dialect, "normalized_language":normalized_language]

groovy/src/test/groovy/io/cucumber/groovy/compiled_stepdefs.groovy

@@ -3,7 +3,7 @@ package io.cucumber.groovy
 import io.cucumber.groovy.EN
 import io.cucumber.datatable.DataTable
 
-import static groovy.util.GroovyTestCase.assertEquals
+import static groovy.test.GroovyTestCase.assertEquals
 
 this.metaClass.mixin(EN)
 this.metaClass.mixin(Hooks)
@@ -19,11 +19,24 @@ Given(~'^I have (\\d+) apples in my belly') { int apples ->
 Given(~'^a big basket with cukes') { ->
 }
 
+@DataTableType
+Thing dataTableTypeThing(Map<String, String> tableEntry) {
+    Thing thing = new Thing()
+    thing.year = Integer.valueOf(tableEntry.get("year"))
+    thing.name = tableEntry.get("name")
+    thing
+}
+
 Given(~'^the following table:$') { DataTable table ->
     things = table.asList(Thing)
     assertEquals("Cucumber-JVM", things[1].name)
 }
 
+@ParameterType(name="list", value="(.+\\s*,\\s*.+){1,}")
+List parameterTypeList(String[] s) {
+    Arrays.asList(s[0].split(","))*.trim()
+}
+
 Given('this should be converted to a list:{list}') { List list ->
     assertEquals(3, list.size())
     assertEquals("Cucumber-JVM", list.get(0))

groovy/src/test/groovy/io/cucumber/groovy/date_stepdefs.groovy

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import java.lang.reflect.Type
 import java.time.LocalDate
 
-import static groovy.util.GroovyTestCase.assertEquals
+import static groovy.test.GroovyTestCase.assertEquals
 
 this.metaClass.mixin(Hooks)
 this.metaClass.mixin(EN)