Merge branch 'jetty-9.4.x'

jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java

@@ -125,7 +125,7 @@ public class TestUseCases
 
             Main main = new Main();
             List<String> cmdLine = new ArrayList<>();
-            // cmdLine.add("--debug");
+            cmdLine.add("--debug");
             if (commandLineArgs != null)
             {
                 for (String arg : commandLineArgs)

jetty-start/src/test/resources/usecases/barebones.addToStartd.prepare.txt

@@ -1 +1,2 @@
---create-startd --add=optional
+--create-startd
+--add-to-start=optional

jetty-start/src/test/resources/usecases/barebones.addUnknown.prepare.txt

@@ -1 +1,2 @@
---create-startd --add=unknown
+--create-startd
+--add-to-start=unknown

jetty-start/src/test/resources/usecases/empty.addToStartCreateStartd.prepare.txt

@@ -1,2 +1,3 @@
---add=extra
---create-startd --add=optional
+--add-to-start=extra
+--create-startd
+--add-to-start=optional

jetty-start/src/test/resources/usecases/files.0.prepare.txt

@@ -1 +1,2 @@
---create-startd --add=demo
+--create-startd
+--add-to-start=demo

jetty-start/src/test/resources/usecases/ordered-provided.0.prepare.txt

@@ -1 +1,2 @@
---create-startd --add=abstractB,abstractA
+--create-startd
+--add-to-start=abstractB,abstractA