Merge remote-tracking branch 'origin/reduce-mockito-usage-pass1' into reduce-mockito-usage-pass1

# Conflicts:
#	cucumber-core/pom.xml
#	cucumber-core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java
#	cucumber-core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java
#	cucumber-core/src/test/java/io/cucumber/core/runner/TestCaseTest.java
#	cucumber-java/pom.xml
#	cucumber-java8/pom.xml
#	cucumber-junit-platform-engine/README.md
#	datatable/pom.xml

Author: U117293

cucumber-core/src/test/java/io/cucumber/core/backend/StubPendingException.java

@@ -1,7 +1,5 @@
 package io.cucumber.core.backend;
 
-import io.cucumber.core.backend.Pending;
-
 import java.io.PrintStream;
 import java.io.PrintWriter;
 

cucumber-core/src/test/java/io/cucumber/core/runtime/ServiceLoaderTestClassLoader.java

@@ -14,14 +14,15 @@
 
 /**
  * Testing classloader for ServiceLoader. This classloader overrides the
- * META-INF/services/interface-class-name file with a custom definition.
+ * META-INF/services/<interface> file with a custom definition.
  */
 public class ServiceLoaderTestClassLoader extends URLClassLoader {
     Class<?> metaInfInterface;
     Class<?>[] implementingClasses;
 
     /**
-     * Constructs a classloader which has no META-INF/services/metaInfInterface.
+     * Constructs a classloader which has no
+     * META-INF/services/&lt;metaInfInterface&gt;.
      *
      * @param metaInfInterface ServiceLoader interface
      */
@@ -30,10 +31,11 @@ public ServiceLoaderTestClassLoader(Class<?> metaInfInterface) {
     }
 
     /**
-     * Constructs a fake META-INF/services/metaInfInterface file which contains
-     * the provided array of classes. When the implementingClasses array is
-     * null, the META-INF file will not be constructed. The classes from
-     * implementingClasses are not required to implement the metaInfInterface.
+     * Constructs a fake META-INF/services/&lt;metaInfInterface&gt; file which
+     * contains the provided array of classes. When the implementingClasses
+     * array is null, the META-INF file will not be constructed. The classes
+     * from implementingClasses are not required to implement the
+     * metaInfInterface.
      *
      * @param metaInfInterface    ServiceLoader interface
      * @param implementingClasses potential subclasses of the ServiceLoader

cucumber-spring/src/test/java/io/cucumber/spring/Issue1970Test.java

@@ -16,7 +16,7 @@
 class Issue1970Test {
 
     @Test
-    public void issue1970() {
+    void issue1970() {
         ObjectFactory factory = new SpringFactory();
         factory.addClass(GlueClass.class); // Add glue with Spring configuration
         factory.start();