Reverting merge of #1301 as well as mistaken follow-up 1e804fdf.

The root problem was missing <scope>test</scope> in domain-discovery.

test/src/test/java/hudson/cli/CLIRegistererTest.java

@@ -3,7 +3,7 @@ package hudson.cli;
 import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
 import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 
 import jenkins.model.Jenkins;

test/src/test/java/hudson/cli/GroovyshCommandTest.java

@@ -27,7 +27,7 @@ package hudson.cli;
 import static hudson.cli.CLICommandInvoker.Matcher.*;
 import jenkins.model.Jenkins;
 import org.apache.tools.ant.filters.StringInputStream;
-import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.*;
 import org.junit.Rule;
 import org.junit.Test;

test/src/test/java/hudson/cli/HelpCommandTest.java

@@ -27,7 +27,6 @@ package hudson.cli;
 import static hudson.cli.CLICommandInvoker.Matcher.*;
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.Matchers.*;
 import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder;
 
 import java.io.PrintStream;

war/pom.xml

@@ -94,11 +94,6 @@ THE SOFTWARE.
       <version>2.9</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>domain-discovery</artifactId>
-      <version>1.0</version>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>instance-identity</artifactId>