diff --git a/modules/cockroachdb/build.gradle b/modules/cockroachdb/build.gradle index fa1e7f06839..3cfe02ee1db 100644 --- a/modules/cockroachdb/build.gradle +++ b/modules/cockroachdb/build.gradle @@ -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" + ] +} diff --git a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java index a7bb1fef7ed..f0c0cf123fb 100644 --- a/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java +++ b/modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java @@ -52,14 +52,6 @@ public class CockroachContainer extends JdbcDatabaseContainer { 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(); @@ -125,15 +123,6 @@ public class CouchbaseContainer extends GenericContainer { 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. * diff --git a/modules/db2/build.gradle b/modules/db2/build.gradle index 3a773f21534..37dd3955764 100644 --- a/modules/db2/build.gradle +++ b/modules/db2/build.gradle @@ -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" + ] +} diff --git a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java index 81f26014b90..18fb4aac0e6 100644 --- a/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java +++ b/modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java @@ -42,14 +42,6 @@ public class Db2Container extends JdbcDatabaseContainer { 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)); } diff --git a/modules/elasticsearch/build.gradle b/modules/elasticsearch/build.gradle index 79faefdde24..2a076837d1f 100644 --- a/modules/elasticsearch/build.gradle +++ b/modules/elasticsearch/build.gradle @@ -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" + ] +} diff --git a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java index 99f8cd75b4f..54f1a4c17f8 100644 --- a/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java +++ b/modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java @@ -68,12 +68,6 @@ public class ElasticsearchContainer extends GenericContainer= 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; @@ -81,14 +75,6 @@ public class ElasticsearchContainer extends GenericContainer> 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 @@ -66,14 +61,6 @@ public class InfluxDBContainer> 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 */ diff --git a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java index e8ce714ab28..7dcd769bf08 100644 --- a/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java +++ b/modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java @@ -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"); diff --git a/modules/localstack/build.gradle b/modules/localstack/build.gradle index 2994bb7d2f2..fb1be0f66f7 100644 --- a/modules/localstack/build.gradle +++ b/modules/localstack/build.gradle @@ -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" + ] +} diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java index fb7d383898a..c38d5a34728 100644 --- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java +++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java @@ -83,14 +83,6 @@ public class LocalStackContainer extends GenericContainer { 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 */ diff --git a/modules/mariadb/build.gradle b/modules/mariadb/build.gradle index 88734091907..7492300b4b6 100644 --- a/modules/mariadb/build.gradle +++ b/modules/mariadb/build.gradle @@ -12,3 +12,9 @@ dependencies { testImplementation testFixtures(project(':r2dbc')) testRuntimeOnly 'org.mariadb:r2dbc-mariadb:1.0.3' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.MariaDBContainer" + ] +} diff --git a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java index fccfde6e4dc..bff0faf9d03 100644 --- a/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java +++ b/modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java @@ -41,14 +41,6 @@ public class MariaDBContainer> 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)); } diff --git a/modules/mockserver/build.gradle b/modules/mockserver/build.gradle index 31f4944a572..ef38d025669 100644 --- a/modules/mockserver/build.gradle +++ b/modules/mockserver/build.gradle @@ -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" + ] +} diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java index 9ca936d1656..00937214445 100644 --- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java +++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java @@ -16,14 +16,6 @@ public class MockServerContainer extends GenericContainer { 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 */ diff --git a/modules/mongodb/build.gradle b/modules/mongodb/build.gradle index 0904df92824..eb3137c205c 100644 --- a/modules/mongodb/build.gradle +++ b/modules/mongodb/build.gradle @@ -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" + ] +} diff --git a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java index 1dbf1fcc74e..e0bb04bb166 100644 --- a/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java +++ b/modules/mongodb/src/main/java/org/testcontainers/containers/MongoDBContainer.java @@ -30,8 +30,6 @@ public class MongoDBContainer extends GenericContainer { "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; @@ -42,14 +40,6 @@ public class MongoDBContainer extends GenericContainer { 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)); } diff --git a/modules/mssqlserver/build.gradle b/modules/mssqlserver/build.gradle index e7541434291..006c5d38031 100644 --- a/modules/mssqlserver/build.gradle +++ b/modules/mssqlserver/build.gradle @@ -15,3 +15,9 @@ dependencies { // MSSQL's wait strategy requires the JDBC driver testImplementation testFixtures(project(':r2dbc')) } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.MSSQLServerContainer" + ] +} diff --git a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java index dab6c34fa16..10ccbff2c36 100644 --- a/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java +++ b/modules/mssqlserver/src/main/java/org/testcontainers/containers/MSSQLServerContainer.java @@ -44,14 +44,6 @@ public class MSSQLServerContainer> 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)); } diff --git a/modules/mysql/build.gradle b/modules/mysql/build.gradle index d31fbcce266..f9d07cdab1c 100644 --- a/modules/mysql/build.gradle +++ b/modules/mysql/build.gradle @@ -14,3 +14,9 @@ dependencies { compileOnly 'org.jetbrains:annotations:24.1.0' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.MySQLContainer" + ] +} diff --git a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java index 76ff754b616..54f3952b6a2 100644 --- a/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java +++ b/modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java @@ -41,14 +41,6 @@ public class MySQLContainer> 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)); } diff --git a/modules/neo4j/build.gradle b/modules/neo4j/build.gradle index d70292361d1..f8529beb3ac 100644 --- a/modules/neo4j/build.gradle +++ b/modules/neo4j/build.gradle @@ -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" + ] +} diff --git a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java index e59e2ea2820..bb6f437f193 100644 --- a/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java +++ b/modules/neo4j/src/main/java/org/testcontainers/containers/Neo4jContainer.java @@ -83,15 +83,6 @@ public class Neo4jContainer> 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. * diff --git a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java index d2497cd900b..334aa155eac 100644 --- a/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java +++ b/modules/neo4j/src/test/java/org/testcontainers/containers/Neo4jContainerTest.java @@ -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."); } diff --git a/modules/nginx/build.gradle b/modules/nginx/build.gradle index 13232b4bfce..a746f0bd1ca 100644 --- a/modules/nginx/build.gradle +++ b/modules/nginx/build.gradle @@ -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" + ] +} diff --git a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java index 9a8687aaf8c..28590de99ab 100644 --- a/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java +++ b/modules/nginx/src/main/java/org/testcontainers/containers/NginxContainer.java @@ -16,16 +16,6 @@ public class NginxContainer> private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("nginx"); - private static final String DEFAULT_TAG = "1.9.4"; - - /** - * @deprecated use {@link #NginxContainer(DockerImageName)} instead - */ - @Deprecated - public NginxContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - public NginxContainer(String dockerImageName) { this(DockerImageName.parse(dockerImageName)); } diff --git a/modules/oracle-xe/build.gradle b/modules/oracle-xe/build.gradle index 3de6202e869..2621e2a261f 100644 --- a/modules/oracle-xe/build.gradle +++ b/modules/oracle-xe/build.gradle @@ -14,3 +14,9 @@ dependencies { testImplementation testFixtures(project(':r2dbc')) testRuntimeOnly 'com.oracle.database.r2dbc:oracle-r2dbc:1.2.0' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.OracleContainer" + ] +} diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java index 75b16779f40..07db62a7b2e 100644 --- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java +++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java @@ -63,14 +63,6 @@ public class OracleContainer extends JdbcDatabaseContainer { private boolean usingSid = false; - /** - * @deprecated use {@link #OracleContainer(DockerImageName)} instead - */ - @Deprecated - public OracleContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - public OracleContainer(String dockerImageName) { this(DockerImageName.parse(dockerImageName)); } diff --git a/modules/orientdb/build.gradle b/modules/orientdb/build.gradle index d353be80783..cece637545d 100644 --- a/modules/orientdb/build.gradle +++ b/modules/orientdb/build.gradle @@ -9,3 +9,9 @@ dependencies { testImplementation 'org.apache.tinkerpop:gremlin-driver:3.7.2' testImplementation "com.orientechnologies:orientdb-gremlin:3.2.33" } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.OrientDBContainer" + ] +} diff --git a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java index aeaf053ff0a..67c81be7e90 100644 --- a/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java +++ b/modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java @@ -36,8 +36,6 @@ public class OrientDBContainer extends GenericContainer { private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("orientdb"); - private static final String DEFAULT_TAG = "3.0.24-tp3"; - private static final String DEFAULT_USERNAME = "admin"; private static final String DEFAULT_PASSWORD = "admin"; @@ -60,14 +58,6 @@ public class OrientDBContainer extends GenericContainer { private ODatabaseSession session; - /** - * @deprecated use {@link #OrientDBContainer(DockerImageName)} instead - */ - @Deprecated - public OrientDBContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - public OrientDBContainer(@NonNull String dockerImageName) { this(DockerImageName.parse(dockerImageName)); } diff --git a/modules/postgresql/build.gradle b/modules/postgresql/build.gradle index 23ad800186b..5dc899ba2b8 100644 --- a/modules/postgresql/build.gradle +++ b/modules/postgresql/build.gradle @@ -14,3 +14,9 @@ dependencies { compileOnly 'org.jetbrains:annotations:24.1.0' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.PostgreSQLContainer" + ] +} diff --git a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java index 27b3679b626..d96f30864d9 100644 --- a/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java +++ b/modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java @@ -41,14 +41,6 @@ public class PostgreSQLContainer> extends private static final String FSYNC_OFF_OPTION = "fsync=off"; - /** - * @deprecated use {@link #PostgreSQLContainer(DockerImageName)} or {@link #PostgreSQLContainer(String)} instead - */ - @Deprecated - public PostgreSQLContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - public PostgreSQLContainer(final String dockerImageName) { this(DockerImageName.parse(dockerImageName)); } diff --git a/modules/pulsar/build.gradle b/modules/pulsar/build.gradle index 7af1bc777e2..5be1b67ce7b 100644 --- a/modules/pulsar/build.gradle +++ b/modules/pulsar/build.gradle @@ -8,3 +8,9 @@ dependencies { testImplementation 'org.apache.pulsar:pulsar-client-admin' testImplementation 'org.assertj:assertj-core:3.26.3' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.PulsarContainer" + ] +} diff --git a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java index 36485ad76a0..027e030c0de 100644 --- a/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java +++ b/modules/pulsar/src/main/java/org/testcontainers/containers/PulsarContainer.java @@ -21,12 +21,6 @@ public class PulsarContainer extends GenericContainer { public static final int BROKER_HTTP_PORT = 8080; - /** - * @deprecated The metrics endpoint is no longer being used for the WaitStrategy. - */ - @Deprecated - public static final String METRICS_ENDPOINT = "/metrics"; - private static final String ADMIN_CLUSTERS_ENDPOINT = "/admin/v2/clusters"; /** @@ -37,23 +31,12 @@ public class PulsarContainer extends GenericContainer { private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("apachepulsar/pulsar"); - @Deprecated - private static final String DEFAULT_TAG = "3.0.0"; - private final WaitAllStrategy waitAllStrategy = new WaitAllStrategy(); private boolean functionsWorkerEnabled = false; private boolean transactionsEnabled = false; - /** - * @deprecated use {@link #PulsarContainer(DockerImageName)} instead - */ - @Deprecated - public PulsarContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - /** * @deprecated use {@link #PulsarContainer(DockerImageName)} instead */ diff --git a/modules/rabbitmq/build.gradle b/modules/rabbitmq/build.gradle index 42a12d68759..3aae4584008 100644 --- a/modules/rabbitmq/build.gradle +++ b/modules/rabbitmq/build.gradle @@ -6,3 +6,9 @@ dependencies { testImplementation 'org.assertj:assertj-core:3.26.3' compileOnly 'org.jetbrains:annotations:24.1.0' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.RabbitMQContainer" + ] +} diff --git a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java index 9eff3fa83f2..3bb45632c54 100644 --- a/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java +++ b/modules/rabbitmq/src/main/java/org/testcontainers/containers/RabbitMQContainer.java @@ -35,8 +35,6 @@ public class RabbitMQContainer extends GenericContainer { */ private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("rabbitmq"); - private static final String DEFAULT_TAG = "3.7.25-management-alpine"; - private static final int DEFAULT_AMQP_PORT = 5672; private static final int DEFAULT_AMQPS_PORT = 5671; @@ -51,15 +49,6 @@ public class RabbitMQContainer extends GenericContainer { private final List> values = new ArrayList<>(); - /** - * Creates a RabbitMQ container using the official RabbitMQ docker image. - * @deprecated use {@link #RabbitMQContainer(DockerImageName)} instead - */ - @Deprecated - public RabbitMQContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - /** * Creates a RabbitMQ container using a specific docker image. * diff --git a/modules/solr/build.gradle b/modules/solr/build.gradle index d8ff7aeba39..fcf7fd7c71b 100644 --- a/modules/solr/build.gradle +++ b/modules/solr/build.gradle @@ -8,3 +8,9 @@ dependencies { testImplementation 'org.apache.solr:solr-solrj:8.11.3' testImplementation 'org.assertj:assertj-core:3.26.3' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.SolrContainer" + ] +} diff --git a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java index b5d8d6abf8d..16c3a0d62d4 100644 --- a/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java +++ b/modules/solr/src/main/java/org/testcontainers/containers/SolrContainer.java @@ -28,12 +28,6 @@ public class SolrContainer extends GenericContainer { private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("solr"); - @Deprecated - public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart(); - - @Deprecated - public static final String DEFAULT_TAG = "8.3.0"; - public static final Integer ZOOKEEPER_PORT = 9983; public static final Integer SOLR_PORT = 8983; @@ -42,17 +36,6 @@ public class SolrContainer extends GenericContainer { private final ComparableVersion imageVersion; - /** - * @deprecated use {@link #SolrContainer(DockerImageName)} instead - */ - @Deprecated - public SolrContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - - /** - * @deprecated use {@link #SolrContainer(DockerImageName)} instead - */ public SolrContainer(final String dockerImageName) { this(DockerImageName.parse(dockerImageName)); } diff --git a/modules/toxiproxy/build.gradle b/modules/toxiproxy/build.gradle index 211d5e38ae3..2545e0a271a 100644 --- a/modules/toxiproxy/build.gradle +++ b/modules/toxiproxy/build.gradle @@ -7,3 +7,9 @@ dependencies { testImplementation 'redis.clients:jedis:5.1.5' testImplementation 'org.assertj:assertj-core:3.26.3' } + +tasks.japicmp { + classExcludes = [ + "org.testcontainers.containers.ToxiproxyContainer" + ] +} diff --git a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java index a2a85a95d88..c28c4e93ddf 100644 --- a/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java +++ b/modules/toxiproxy/src/main/java/org/testcontainers/containers/ToxiproxyContainer.java @@ -31,8 +31,6 @@ public class ToxiproxyContainer extends GenericContainer { private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("shopify/toxiproxy"); - private static final String DEFAULT_TAG = "2.1.0"; - private static final DockerImageName GHCR_IMAGE_NAME = DockerImageName.parse("ghcr.io/shopify/toxiproxy"); private static final int TOXIPROXY_CONTROL_PORT = 8474; @@ -47,14 +45,6 @@ public class ToxiproxyContainer extends GenericContainer { private final AtomicInteger nextPort = new AtomicInteger(FIRST_PROXIED_PORT); - /** - * @deprecated use {@link #ToxiproxyContainer(DockerImageName)} instead - */ - @Deprecated - public ToxiproxyContainer() { - this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG)); - } - public ToxiproxyContainer(String dockerImageName) { this(DockerImageName.parse(dockerImageName)); }