diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a9910a..f613f20 100644
--- a/CHANGELOG.md
+++ b/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
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 87ed33a..6557b80 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,18 +4,13 @@
     <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>
@@ -23,19 +18,23 @@
             <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>
@@ -43,15 +42,15 @@
     <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>
diff --git a/examples/src/test/groovy/calc/CalculatorSteps.groovy b/examples/src/test/groovy/calc/CalculatorSteps.groovy
index ca33548..eada7d2 100644
--- a/examples/src/test/groovy/calc/CalculatorSteps.groovy
+++ b/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 ->
diff --git a/examples/src/test/java/calc/RunCukesTest.java b/examples/src/test/java/calc/RunCukesTest.java
index c74a78a..26c45f2 100644
--- a/examples/src/test/java/calc/RunCukesTest.java
+++ b/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 {
 }
diff --git a/examples/src/test/resources/junit-platform.properties b/examples/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000..b48dd63
--- /dev/null
+++ b/examples/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+cucumber.publish.quiet=true
diff --git a/groovy/pom.xml b/groovy/pom.xml
index 56dcfba..bad8f64 100644
--- a/groovy/pom.xml
+++ b/groovy/pom.xml
@@ -4,7 +4,7 @@
     <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>
@@ -12,42 +12,67 @@
     <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>
@@ -55,6 +80,11 @@
             <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:
 
diff --git a/groovy/src/main/groovy/I18n.groovy.gsp b/groovy/src/main/groovy/I18n.groovy.gsp
index 00833d2..a055def 100644
--- a/groovy/src/main/groovy/I18n.groovy.gsp
+++ b/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);
     }
 <% } %>
 }
diff --git a/groovy/src/main/groovy/generate-keywords.groovy b/groovy/src/main/groovy/generate-keywords.groovy
index 1f54eaf..b8c907d 100644
--- a/groovy/src/main/groovy/generate-keywords.groovy
+++ b/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]
diff --git a/groovy/src/test/groovy/io/cucumber/groovy/TypeRegistryConfiguration.groovy b/groovy/src/test/groovy/io/cucumber/groovy/TypeRegistryConfiguration.groovy
deleted file mode 100644
index 21528c3..0000000
--- a/groovy/src/test/groovy/io/cucumber/groovy/TypeRegistryConfiguration.groovy
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.cucumber.groovy
-
-
-import io.cucumber.core.api.TypeRegistry
-import io.cucumber.core.api.TypeRegistryConfigurer
-import io.cucumber.cucumberexpressions.CaptureGroupTransformer
-import io.cucumber.cucumberexpressions.ParameterType
-import io.cucumber.datatable.DataTableType
-import io.cucumber.datatable.TableEntryTransformer
-
-import java.time.LocalDate
-
-import static java.util.Locale.ENGLISH
-
-class TypeRegistryConfiguration implements TypeRegistryConfigurer {
-
-    @Override
-    Locale locale() {
-        return ENGLISH
-    }
-
-    @Override
-    void configureTypeRegistry(TypeRegistry typeRegistry) {
-
-        final TableEntryTransformer<Thing> transformer = new TableEntryTransformer<Thing>() {
-            @Override
-            Thing transform(Map<String, String> tableEntry) {
-                Thing thing = new Thing()
-                thing.year = Integer.valueOf(tableEntry.get("year"))
-                thing.name = tableEntry.get("name")
-                thing
-            }
-        }
-        typeRegistry.defineDataTableType(new DataTableType(Thing.class, transformer))
-
-        CaptureGroupTransformer<DateWrapper> dateTransformer =
-                { String[] s -> new DateWrapper(date: LocalDate.parse(s[0])) }
-
-
-        CaptureGroupTransformer<List> listTransformer = { String[] s ->
-            return Arrays.asList(s[0].split(","))*.trim()
-        }
-
-        typeRegistry.defineParameterType(new ParameterType<>(
-                "date",
-                "(\\d{4}-\\d{2}-\\d{2})",
-                DateWrapper.class,
-                dateTransformer
-        ))
-
-        typeRegistry.defineParameterType(new ParameterType<>(
-                "list",
-                "(.+\\s*,\\s*.+){1,}",
-                List.class,
-                listTransformer
-        ))
-    }
-
-
-}
diff --git a/groovy/src/test/groovy/io/cucumber/groovy/compiled_stepdefs.groovy b/groovy/src/test/groovy/io/cucumber/groovy/compiled_stepdefs.groovy
index adfd23e..a8c1c63 100644
--- a/groovy/src/test/groovy/io/cucumber/groovy/compiled_stepdefs.groovy
+++ b/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))
diff --git a/groovy/src/test/groovy/io/cucumber/groovy/date_stepdefs.groovy b/groovy/src/test/groovy/io/cucumber/groovy/date_stepdefs.groovy
index 20926df..a4d005d 100644
--- a/groovy/src/test/groovy/io/cucumber/groovy/date_stepdefs.groovy
+++ b/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)
diff --git a/groovy/src/test/groovy/io/cucumber/groovy/steps.groovy b/groovy/src/test/groovy/io/cucumber/groovy/steps.groovy
index e0b16dd..136605a 100644
--- a/groovy/src/test/groovy/io/cucumber/groovy/steps.groovy
+++ b/groovy/src/test/groovy/io/cucumber/groovy/steps.groovy
@@ -1,6 +1,5 @@
 package io.cucumber.groovy
 
-import io.cucumber.datatable.DataTable
 
 import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertTrue
@@ -11,11 +10,6 @@ final Author expectedAuthor = new Author("Annie M. G.", "Schmidt", "1911-03-20")
 final Person expectedPerson = new Person("Astrid", "Lindgren")
 final Person mononymousPerson = new Person("Plato", "")
 
-@DataTableType
-static Author singleAuthorTransformer(DataTable table) {
-    return authorEntryTransformer(table.asMaps().get(0))
-}
-
 @DataTableType
 static Author authorEntryTransformer(Map<String, String> entry) {
     return new Author(
diff --git a/groovy/src/test/java/io/cucumber/groovy/GroovyBackendTest.java b/groovy/src/test/java/io/cucumber/groovy/GroovyBackendTest.java
index d47274e..4773a82 100644
--- a/groovy/src/test/java/io/cucumber/groovy/GroovyBackendTest.java
+++ b/groovy/src/test/java/io/cucumber/groovy/GroovyBackendTest.java
@@ -4,18 +4,18 @@
 import io.cucumber.core.backend.Container;
 import io.cucumber.core.backend.Lookup;
 import org.codehaus.groovy.runtime.MethodClosure;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.function.Supplier;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class GroovyBackendTest {
     @Mock
     Lookup lookup;
@@ -29,8 +29,8 @@ public class GroovyBackendTest {
     @Mock
     Supplier<ClassLoader> classLoaderSupplier;
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+    public void setUp() {
         backend = new GroovyBackend(lookup, container, classLoaderSupplier);
     }
 
diff --git a/groovy/src/test/java/io/cucumber/groovy/GroovySnippetTest.java b/groovy/src/test/java/io/cucumber/groovy/GroovySnippetTest.java
index a1f6c31..173ce12 100644
--- a/groovy/src/test/java/io/cucumber/groovy/GroovySnippetTest.java
+++ b/groovy/src/test/java/io/cucumber/groovy/GroovySnippetTest.java
@@ -6,13 +6,13 @@
 import io.cucumber.core.snippets.SnippetGenerator;
 import io.cucumber.core.snippets.SnippetType;
 import io.cucumber.cucumberexpressions.ParameterTypeRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class GroovySnippetTest {
 
@@ -28,7 +28,7 @@ public void generatesPlainSnippet() {
     }
 
     @Test
-    public void generatesCopyPasteReadyStepSnippetForNumberParameters() throws Exception {
+    public void generatesCopyPasteReadyStepSnippetForNumberParameters() {
         List<String> expected = Collections.singletonList("" +
                 "Given(/before {int} after/) { Integer int1 ->\n" +
                 "    // Write code here that turns the phrase above into concrete actions\n" +
diff --git a/groovy/src/test/java/io/cucumber/groovy/GroovyStackTraceTest.java b/groovy/src/test/java/io/cucumber/groovy/GroovyStackTraceTest.java
index bd0ed81..a9b3019 100644
--- a/groovy/src/test/java/io/cucumber/groovy/GroovyStackTraceTest.java
+++ b/groovy/src/test/java/io/cucumber/groovy/GroovyStackTraceTest.java
@@ -2,34 +2,35 @@
 
 import groovy.lang.Closure;
 import org.codehaus.groovy.runtime.MethodClosure;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@ExtendWith(MockitoExtension.class)
 public class GroovyStackTraceTest {
     GroovyStepDefinition groovyStepDefinition;
 
 
-    @Before
-    public void setUp() throws Throwable {
-        Closure body = new MethodClosure("the owner", "length");
+    @BeforeEach
+    public void setUp() {
+        Closure<?> body = new MethodClosure("the owner", "length");
         groovyStepDefinition = new GroovyStepDefinition("", body, null, new ExceptionThrowingBackend());
     }
 
     @Test
-    public void should_sanitize_stacktrace() throws Throwable {
+    public void should_sanitize_stacktrace() {
         try {
             groovyStepDefinition.execute(new Object[0]);
             fail("step definition didn't throw an exception");
         } catch (Throwable thrown) {
             for (StackTraceElement stackTraceElement : thrown.getStackTrace()) {
                 // if there are none of these, pretty good chance it's cleaned up the stack trace
-                assertFalse("Stack trace has internal groovy callsite elements", stackTraceElement.getClassName().startsWith("org.codehaus.groovy.runtime.callsite"));
+                assertFalse(stackTraceElement.getClassName().startsWith("org.codehaus.groovy.runtime.callsite"), "Stack trace has internal groovy callsite elements");
             }
         }
 
diff --git a/groovy/src/test/java/io/cucumber/groovy/GroovyWorldTest.java b/groovy/src/test/java/io/cucumber/groovy/GroovyWorldTest.java
index b6af689..1953cc2 100644
--- a/groovy/src/test/java/io/cucumber/groovy/GroovyWorldTest.java
+++ b/groovy/src/test/java/io/cucumber/groovy/GroovyWorldTest.java
@@ -1,24 +1,25 @@
 package io.cucumber.groovy;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class GroovyWorldTest {
     GroovyWorld world;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         world = new GroovyWorld();
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void should_not_register_pure_java_object() {
-        world.registerWorld("JAVA");
+        assertThrows(RuntimeException.class, () -> world.registerWorld("JAVA"));
     }
 
     @Test
@@ -40,19 +41,19 @@ public void should_support_more_then_one_World() {
         assertEquals("no args", world.getProperty("methodArgs"));
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void should_detect_double_property_definition() {
         world.registerWorld(new WorldWithPropertyAndMethod());
         world.registerWorld(new AnotherCustomWorld());
 
-        world.getProperty("aProperty");
+        assertThrows(RuntimeException.class, () -> world.getProperty("aProperty"));
     }
 
-    @Test(expected = RuntimeException.class)
+    @Test
     public void should_detect_double_method_definition() {
         world.registerWorld(new WorldWithPropertyAndMethod());
         world.registerWorld(new AnotherCustomWorld());
 
-        world.invokeMethod("aMethod", new Integer[]{1, 2});
+        assertThrows(RuntimeException.class, () -> world.invokeMethod("aMethod", new Integer[]{1, 2}));
     }
 }
diff --git a/groovy/src/test/java/io/cucumber/groovy/HooksTest.java b/groovy/src/test/java/io/cucumber/groovy/HooksTest.java
index 39a610a..7b40018 100644
--- a/groovy/src/test/java/io/cucumber/groovy/HooksTest.java
+++ b/groovy/src/test/java/io/cucumber/groovy/HooksTest.java
@@ -3,10 +3,10 @@
 
 import io.cucumber.core.exception.CucumberException;
 import org.codehaus.groovy.runtime.MethodClosure;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class HooksTest {
 
diff --git a/groovy/src/test/java/io/cucumber/groovy/ParallelTest.java b/groovy/src/test/java/io/cucumber/groovy/ParallelTest.java
index 3608fdd..affd8ad 100644
--- a/groovy/src/test/java/io/cucumber/groovy/ParallelTest.java
+++ b/groovy/src/test/java/io/cucumber/groovy/ParallelTest.java
@@ -2,32 +2,29 @@
 
 
 import groovy.lang.Closure;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.function.Supplier;
 
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ParallelTest {
     @Mock
     Supplier<ClassLoader> classLoaderSupplier;
     @Mock
-    Closure closure;
+    Closure<?> closure;
 
     @Test
     public void can_have_a_new_backend_on_a_different_thread() {
         new GroovyBackend(null, null, classLoaderSupplier);
-        Thread interactWithBackendThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    GroovyBackend.getInstance().registerWorld(closure);
-                } catch (NullPointerException e) {
-                    // This is what we want as there should be no GroovyBackend on this thread
-                }
+        Thread interactWithBackendThread = new Thread(() -> {
+            try {
+                GroovyBackend.getInstance().registerWorld(closure);
+            } catch (NullPointerException e) {
+                // This is what we want as there should be no GroovyBackend on this thread
             }
         });
         runAndWait(interactWithBackendThread);
diff --git a/groovy/src/test/java/io/cucumber/groovy/RunCukesTest.java b/groovy/src/test/java/io/cucumber/groovy/RunCukesTest.java
index 491a748..04e1fe4 100644
--- a/groovy/src/test/java/io/cucumber/groovy/RunCukesTest.java
+++ b/groovy/src/test/java/io/cucumber/groovy/RunCukesTest.java
@@ -1,9 +1,15 @@
 package io.cucumber.groovy;
 
+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;
 
-import io.cucumber.junit.Cucumber;
-import org.junit.runner.RunWith;
+import static io.cucumber.junit.platform.engine.Constants.GLUE_PROPERTY_NAME;
 
-@RunWith(Cucumber.class)
+@Suite
+@IncludeEngines("cucumber")
+@SelectClasspathResource("io/cucumber/groovy")
+@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "io.cucumber.groovy")
 public class RunCukesTest {
 }
diff --git a/groovy/src/test/resources/junit-platform.properties b/groovy/src/test/resources/junit-platform.properties
new file mode 100644
index 0000000..b48dd63
--- /dev/null
+++ b/groovy/src/test/resources/junit-platform.properties
@@ -0,0 +1 @@
+cucumber.publish.quiet=true
diff --git a/pom.xml b/pom.xml
index 445df6b..e41f01b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cucumber-jvm-groovy</artifactId>
-    <version>6.10.5-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Cucumber-JVM: Groovy</name>
     <description>Cucumber for Groovy</description>
@@ -28,11 +28,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <minimum.maven.version>3.3</minimum.maven.version>
         <outputDirectory>${project.build.directory}</outputDirectory>
-        <cucumber.version>6.11.0</cucumber.version>
-        <gherkin.version>18.1.1</gherkin.version>
-        <groovy.version>2.4.21</groovy.version>
+        <cucumber.version>7.11.2</cucumber.version>
+        <gherkin.version>26.1.0</gherkin.version>
+        <groovy.version>4.0.11</groovy.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
-        <mockito.version>5.3.1</mockito.version>
         <project.Automatic-Module-Name>io.cucumber.groovy</project.Automatic-Module-Name>
     </properties>
 
@@ -46,39 +45,30 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-groovy</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-core</artifactId>
+                <artifactId>cucumber-bom</artifactId>
                 <version>${cucumber.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>${groovy.version}</version>
-                <scope>provided</scope>
-            </dependency>
-
             <dependency>
                 <groupId>io.cucumber</groupId>
-                <artifactId>cucumber-junit</artifactId>
-                <version>${cucumber.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>${junit-jupiter.version}</version>
-                <scope>test</scope>
+                <artifactId>cucumber-groovy</artifactId>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
-                <scope>test</scope>
+                <groupId>org.apache.groovy</groupId>
+                <artifactId>groovy-bom</artifactId>
+                <version>${groovy.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -110,9 +100,15 @@
                     <version>3.1.0</version>
                     <dependencies>
                         <dependency>
-                            <groupId>org.codehaus.groovy</groupId>
+                            <groupId>org.apache.groovy</groupId>
                             <artifactId>groovy-all</artifactId>
                             <version>${groovy.version}</version>
+                            <type>pom</type>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.groovy</groupId>
+                            <artifactId>groovy-ant</artifactId>
+                            <version>${groovy.version}</version>
                         </dependency>
                         <dependency>
                             <groupId>io.cucumber</groupId>
@@ -124,7 +120,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.0.0</version>
                     <configuration>
                         <argLine>-Duser.language=en</argLine>
                         <argLine>-Xmx1024m</argLine>
@@ -141,9 +137,9 @@
 
                 <!-- Non-standard plugins -->
                 <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>1.5</version>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
+                    <version>2.1.0</version>
                 </plugin>
 
                 <!--  Code coverage reporting -->