Merge remote-tracking branch 'origin/main' into v7.x.x

Author: mpkorstanje

.revapi/api-changes.json

@@ -65,6 +65,41 @@
             "old": "interface io.cucumber.messages.internal.com.google.protobuf.MutabilityOracle",
             "new": "interface io.cucumber.messages.internal.com.google.protobuf.MutabilityOracle",
             "justification": "Internal API"
+          },
+          {
+            "ignore": true,
+            "regex": true,
+            "code": "java\\.method\\.parameterTypeParameterChanged",
+            "old": "parameter com\\.google\\.inject\\..*",
+            "new": "parameter com\\.google\\.inject\\..*",
+            "justification": "Provided dependency"
+          },
+          {
+            "ignore": true,
+            "regex": true,
+            "code": "java.class.externalClassExposedInAPI",
+            "new": "enum com\\.google\\.inject\\..*",
+            "justification": "Provided dependency"
+          },
+          {
+            "ignore": true,
+            "regex": true,
+            "code": "java\\.class\\.externalClassExposedInAPI",
+            "new": "class com\\.google\\.inject\\..*",
+            "justification": "Provided dependency"
+          },
+          {
+            "ignore": true,
+            "code": "java.field.serialVersionUIDUnchanged",
+            "old": "field com.google.inject.spi.Message.serialVersionUID",
+            "new": "field com.google.inject.spi.Message.serialVersionUID",
+            "justification": "Provided dependency"
+          },
+          {
+            "ignore": true,
+            "code": "java.method.removed",
+            "old": "method java.util.List<com.google.inject.spi.DependencyAndSource> com.google.inject.spi.ProvisionListener.ProvisionInvocation<T>::getDependencyChain()",
+            "justification": "Provided dependency"
           }
         ]
       }

guice/pom.xml

@@ -13,7 +13,7 @@
 
     <properties>
         <project.Automatic-Module-Name>io.cucumber.guice</project.Automatic-Module-Name>
-        <guice.version>4.2.3</guice.version>
+        <guice.version>5.0.1</guice.version>
     </properties>
 
     <dependencies>

guice/src/test/java/io/cucumber/guice/GuiceFactoryTest.java

@@ -20,9 +20,8 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalToCompressingWhiteSpace;
-import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class GuiceFactoryTest {
@@ -71,11 +70,10 @@ void factoryStartFailsIfScenarioScopeIsNotBound() {
 
         Executable testMethod = () -> factory.start();
         ConfigurationException actualThrown = assertThrows(ConfigurationException.class, testMethod);
-        assertThat("Unexpected exception message", actualThrown.getMessage(), is(equalToCompressingWhiteSpace(
-            "Guice configuration errors:\n\n" +
-                    "1) No implementation for io.cucumber.guice.ScenarioScope was bound.\n" +
-                    "  while locating io.cucumber.guice.ScenarioScope\n\n" +
-                    "1 error")));
+        assertThat("Unexpected exception message", actualThrown.getMessage(), startsWith(
+            "Guice configuration errors:\n" +
+                    "\n" +
+                    "1) [Guice/MissingImplementation]: No implementation for ScenarioScope was bound."));
     }
 
     @Test