Merge branch '2.3.x'

spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle

@@ -11,13 +11,11 @@ dependencies {
 	compileOnly("com.datastax.oss:java-driver-core")
 	compileOnly("javax.servlet:javax.servlet-api")
 	compileOnly("junit:junit")
-	compileOnly("org.elasticsearch:elasticsearch")
 	compileOnly("org.junit.jupiter:junit-jupiter")
 	compileOnly("org.junit.platform:junit-platform-engine")
 	compileOnly("org.mockito:mockito-core")
 	compileOnly("org.springframework:spring-context")
 	compileOnly("org.springframework.data:spring-data-redis")
-	compileOnly("org.testcontainers:elasticsearch")
 	compileOnly("org.testcontainers:testcontainers")
 
 	implementation("org.apache.maven.resolver:maven-resolver-connector-basic")

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/VersionOverridingElasticsearchContainer.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2012-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.boot.testsupport.testcontainers;
-
-import org.elasticsearch.Version;
-import org.testcontainers.elasticsearch.ElasticsearchContainer;
-
-/**
- * Extension of {@link ElasticsearchContainer} to override default version.
- *
- * @author Scott Frederick
- */
-public class VersionOverridingElasticsearchContainer extends ElasticsearchContainer {
-
-	/**
-	 * Elasticsearch Docker base URL
-	 */
-	private static final String ELASTICSEARCH_IMAGE = "docker.elastic.co/elasticsearch/elasticsearch";
-
-	/**
-	 * Elasticsearch version
-	 */
-	protected static final String ELASTICSEARCH_VERSION = Version.CURRENT.toString();
-
-	public VersionOverridingElasticsearchContainer() {
-		super(ELASTICSEARCH_IMAGE + ":" + ELASTICSEARCH_VERSION);
-	}
-
-}