From 74754952db4dc7688b666669645e0d7f3462e468 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 24 Feb 2016 19:43:56 -0800 Subject: [PATCH] Remove mention of mvn from RestIT and Security --- core/src/main/java/org/elasticsearch/bootstrap/Security.java | 2 +- .../deb/src/test/java/org/elasticsearch/test/rest/RestIT.java | 4 ++-- .../src/test/java/org/elasticsearch/test/rest/RestIT.java | 4 ++-- .../rpm/src/test/java/org/elasticsearch/test/rest/RestIT.java | 4 ++-- .../tar/src/test/java/org/elasticsearch/test/rest/RestIT.java | 4 ++-- .../zip/src/test/java/org/elasticsearch/test/rest/RestIT.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Security.java b/core/src/main/java/org/elasticsearch/bootstrap/Security.java index b9d2bfda24a..974be9aba85 100644 --- a/core/src/main/java/org/elasticsearch/bootstrap/Security.java +++ b/core/src/main/java/org/elasticsearch/bootstrap/Security.java @@ -98,7 +98,7 @@ import java.util.Map; *

* When running tests you have to pass it to the test runner like this: *

- * mvn test -Dtests.jvm.argline="-Djava.security.debug=access,failure" ...
+ * gradle test -Dtests.jvm.argline="-Djava.security.debug=access,failure" ...
  * 
* See * Troubleshooting Security for information. diff --git a/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java index 5537bbfa646..2d90db2c5b7 100644 --- a/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -24,12 +24,12 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -/** Rest integration test. runs against external cluster in 'mvn verify' */ +/** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } - // we run them all sequentially: start simple! + @ParametersFactory public static Iterable parameters() throws IOException, RestTestParseException { return createParameters(0, 1); diff --git a/distribution/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RestIT.java index 5537bbfa646..2d90db2c5b7 100644 --- a/distribution/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/integ-test-zip/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -24,12 +24,12 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -/** Rest integration test. runs against external cluster in 'mvn verify' */ +/** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } - // we run them all sequentially: start simple! + @ParametersFactory public static Iterable parameters() throws IOException, RestTestParseException { return createParameters(0, 1); diff --git a/distribution/rpm/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/rpm/src/test/java/org/elasticsearch/test/rest/RestIT.java index 5537bbfa646..2d90db2c5b7 100644 --- a/distribution/rpm/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/rpm/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -24,12 +24,12 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -/** Rest integration test. runs against external cluster in 'mvn verify' */ +/** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } - // we run them all sequentially: start simple! + @ParametersFactory public static Iterable parameters() throws IOException, RestTestParseException { return createParameters(0, 1); diff --git a/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java index 5537bbfa646..2d90db2c5b7 100644 --- a/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -24,12 +24,12 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -/** Rest integration test. runs against external cluster in 'mvn verify' */ +/** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } - // we run them all sequentially: start simple! + @ParametersFactory public static Iterable parameters() throws IOException, RestTestParseException { return createParameters(0, 1); diff --git a/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java index 5537bbfa646..2d90db2c5b7 100644 --- a/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -24,12 +24,12 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -/** Rest integration test. runs against external cluster in 'mvn verify' */ +/** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } - // we run them all sequentially: start simple! + @ParametersFactory public static Iterable parameters() throws IOException, RestTestParseException { return createParameters(0, 1);