Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix invalid json example in POST access endpoint (remove array)
  ElasticV7QueryChangesTest: Close indices after test
  Upgrade Testcontainers to 1.10.2 and use ElasticsearchContainer

Adapt ElasticV{5,6,7}QueryProjectsTest accordingly, as these are only
implemented starting with stable-2.16.

Change-Id: I0666decbeda54cae6e59f7bba0caaaf5550f4318
This commit is contained in:
David Pursehouse
2018-12-05 08:48:30 +09:00
committed by Marco Miller
19 changed files with 71 additions and 43 deletions

View File

@@ -32,7 +32,7 @@ public class ElasticV6QueryProjectsTest extends AbstractQueryProjectsTest {
}
private static ElasticNodeInfo nodeInfo;
private static ElasticContainer<?> container;
private static ElasticContainer container;
@BeforeClass
public static void startIndexService() {