Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions modules/cockroachdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ dependencies {
testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.CockroachContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,6 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer

private boolean isVersionGreaterThanOrEqualTo221;

/**
* @deprecated use {@link #CockroachContainer(DockerImageName)} instead
*/
@Deprecated
public CockroachContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

public CockroachContainer(final String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}
Expand Down
6 changes: 6 additions & 0 deletions modules/couchbase/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ dependencies {
testImplementation 'org.awaitility:awaitility:4.2.0'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.couchbase.CouchbaseContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("couchbase/server");

private static final String DEFAULT_TAG = "6.5.1";

private static final ObjectMapper MAPPER = new ObjectMapper();

private static final OkHttpClient HTTP_CLIENT = new OkHttpClient();
Expand Down Expand Up @@ -125,15 +123,6 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {

private boolean hasTlsPorts = false;

/**
* Creates a new couchbase container with the default image and version.
* @deprecated use {@link #CouchbaseContainer(DockerImageName)} instead
*/
@Deprecated
public CouchbaseContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

/**
* Creates a new couchbase container with the specified image name.
*
Expand Down
6 changes: 6 additions & 0 deletions modules/db2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ dependencies {
testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.Db2Container"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {

private String password = "foobar1234";

/**
* @deprecated use {@link #Db2Container(DockerImageName)} instead
*/
@Deprecated
public Db2Container() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

public Db2Container(String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}
Expand Down
6 changes: 6 additions & 0 deletions modules/elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ dependencies {
testImplementation "org.elasticsearch.client:transport:7.17.24"
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.elasticsearch.ElasticsearchContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -68,27 +68,13 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
// default location of the automatically generated self-signed HTTP cert for versions >= 8
private static final String DEFAULT_CERT_PATH = "/usr/share/elasticsearch/config/certs/http_ca.crt";

/**
* Elasticsearch Default version
*/
@Deprecated
protected static final String DEFAULT_TAG = "7.9.2";

@Deprecated
private boolean isOss = false;

private final boolean isAtLeastMajorVersion8;

private String certPath = "";

/**
* @deprecated use {@link #ElasticsearchContainer(DockerImageName)} instead
*/
@Deprecated
public ElasticsearchContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

/**
* Create an Elasticsearch Container by passing the full docker image name
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void stopRestClient() throws IOException {
public void elasticsearchDeprecatedCtorTest() throws IOException {
// Create the elasticsearch container.
try (
ElasticsearchContainer container = new ElasticsearchContainer().withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
) {
// Start the container. This step might take some time...
container.start();
Expand Down
6 changes: 6 additions & 0 deletions modules/influxdb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ dependencies {
testImplementation 'org.influxdb:influxdb-java:2.24'
testImplementation "com.influxdb:influxdb-client-java:6.12.0"
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.InfluxDBContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb");

private static final String DEFAULT_TAG = "1.4.3";

@Deprecated
public static final String VERSION = DEFAULT_TAG;

private static final int NO_CONTENT_STATUS_CODE = 204;

@Getter
Expand Down Expand Up @@ -66,14 +61,6 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen

private final boolean isAtLeastMajorVersion2;

/**
* @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
*/
@Deprecated
public InfluxDBContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

/**
* @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ class MixedLifecycleTests {

// will be shared between test methods
@Container
private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer();
private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer("mysql:8.0.36");

// will be started before and stopped after each test method
@Container
private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer()
private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer("postgres:9.6.12")
.withDatabaseName("foo")
.withUsername("foo")
.withPassword("secret");
Expand Down
6 changes: 6 additions & 0 deletions modules/localstack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ dependencies {
testImplementation 'software.amazon.awssdk:s3:2.28.6'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.localstack.LocalStackContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,6 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {

private final boolean isVersion2;

/**
* @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
*/
@Deprecated
public LocalStackContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

/**
* @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
*/
Expand Down
6 changes: 6 additions & 0 deletions modules/mariadb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ dependencies {
testImplementation testFixtures(project(':r2dbc'))
testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.MariaDBContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD

private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";

/**
* @deprecated use {@link #MariaDBContainer(DockerImageName)} instead
*/
@Deprecated
public MariaDBContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

public MariaDBContainer(String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}
Expand Down
6 changes: 6 additions & 0 deletions modules/mockserver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ dependencies {
testImplementation 'org.mock-server:mockserver-client-java:5.15.0'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.MockServerContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@ public class MockServerContainer extends GenericContainer<MockServerContainer> {

public static final int PORT = 1080;

/**
* @deprecated use {@link #MockServerContainer(DockerImageName)} instead
*/
@Deprecated
public MockServerContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

/**
* @deprecated use {@link #MockServerContainer(DockerImageName)} instead
*/
Expand Down
6 changes: 6 additions & 0 deletions modules/mongodb/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ dependencies {
testImplementation("org.mongodb:mongodb-driver-sync:5.1.4")
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.MongoDBContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {
"mongodb/mongodb-enterprise-server"
);

private static final String DEFAULT_TAG = "4.0.10";

private static final int CONTAINER_EXIT_CODE_OK = 0;

private static final int AWAIT_INIT_REPLICA_SET_ATTEMPTS = 60;
Expand All @@ -42,14 +40,6 @@ public class MongoDBContainer extends GenericContainer<MongoDBContainer> {

private boolean shardingEnabled;

/**
* @deprecated use {@link #MongoDBContainer(DockerImageName)} instead
*/
@Deprecated
public MongoDBContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

public MongoDBContainer(@NonNull final String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}
Expand Down
6 changes: 6 additions & 0 deletions modules/mssqlserver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ dependencies {
// MSSQL's wait strategy requires the JDBC driver
testImplementation testFixtures(project(':r2dbc'))
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.MSSQLServerContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@ public class MSSQLServerContainer<SELF extends MSSQLServerContainer<SELF>> exten
Pattern.compile("[^a-zA-Z0-9]+", Pattern.CASE_INSENSITIVE),
};

/**
* @deprecated use {@link #MSSQLServerContainer(DockerImageName)} instead
*/
@Deprecated
public MSSQLServerContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

public MSSQLServerContainer(final String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}
Expand Down
6 changes: 6 additions & 0 deletions modules/mysql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ dependencies {

compileOnly 'org.jetbrains:annotations:24.1.0'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.MySQLContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab

private static final String MYSQL_ROOT_USER = "root";

/**
* @deprecated use {@link #MySQLContainer(DockerImageName)} instead
*/
@Deprecated
public MySQLContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

public MySQLContainer(String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}
Expand Down
6 changes: 6 additions & 0 deletions modules/neo4j/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,9 @@ dependencies {
testImplementation 'org.neo4j.driver:neo4j-java-driver:4.4.18'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.Neo4jContainer"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,6 @@ public class Neo4jContainer<S extends Neo4jContainer<S>> extends GenericContaine
.forPort(DEFAULT_HTTP_PORT)
.forStatusCodeMatching(response -> response == HttpURLConnection.HTTP_OK);

/**
* Creates a Neo4jContainer using the official Neo4j docker image.
* @deprecated use {@link #Neo4jContainer(DockerImageName)} instead
*/
@Deprecated
public Neo4jContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

/**
* Creates a Neo4jContainer using a specific docker image.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ public void shouldCopyDatabase() {
@Test
public void shouldFailOnCopyDatabaseForDefaultNeo4j4Image() {
assertThatIllegalArgumentException()
.isThrownBy(() -> new Neo4jContainer<>().withDatabase(MountableFile.forClasspathResource("/test-graph.db")))
.isThrownBy(() -> {
new Neo4jContainer<>("neo4j:4.4.1").withDatabase(MountableFile.forClasspathResource("/test-graph.db"));
})
.withMessage("Copying database folder is not supported for Neo4j instances with version 4.0 or higher.");
}

Expand Down
6 changes: 6 additions & 0 deletions modules/nginx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@ dependencies {
compileOnly 'org.jetbrains:annotations:24.1.0'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

tasks.japicmp {
classExcludes = [
"org.testcontainers.containers.NginxContainer"
]
}
Loading
Loading