Skip to content

use DirtiesContext for Singletons, delete Bitnami, Update testcontainers to v2 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karle0wne merged 2 commits into from
Nov 17, 2025
Merged

use DirtiesContext for Singletons, delete Bitnami, Update testcontainers to v2 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6c57e6
use DirtiesContext for Singletons, @Deprecated to Bitnami
karle0wne Nov 15, 2025
4eb588e
delete Bitnami container, Update testcontainers to v2
karle0wne Nov 15, 2025
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
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

```
postgres
bitnami/kafka
apache/kafka
confluentinc/kafka
clickhouse/clickhouse-server
Expand All @@ -40,8 +39,6 @@ testcontainers:
postgresql:
tag: '17'
kafka:
bitnami:
tag: '3.8'
apache:
tag: '3.8.0'
confluent:
Expand Down
28 changes: 14 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<packaging>jar</packaging>

<artifactId>testcontainers-annotations</artifactId>
<version>3.3.2</version>
<version>4.0.0</version>

<name>testcontainers-annotations</name>
<description>testcontainers-annotations</description>
Expand All @@ -39,7 +39,7 @@
</scm>

<properties>
<woody.version>2.0.9</woody.version>
<woody.version>2.1.0</woody.version>
<kafka-common-lib.version>0.0.3</kafka-common-lib.version>
<geck.version>1.0.2</geck.version>
<lombok.version>1.18.38</lombok.version>
Expand All @@ -50,30 +50,30 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.12.2</version>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>2.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.21.0</version>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.5.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.19.0</version>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.12.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.5.4</version>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.19.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 2 additions & 0 deletions ...va/dev/vality/testcontainers/annotations/clickhouse/ClickhouseTestcontainerSingleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down Expand Up @@ -52,6 +53,7 @@
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@ExtendWith(ClickhouseTestcontainerExtension.class)
@DirtiesContext
public @interface ClickhouseTestcontainerSingleton {

/**
Expand Down
24 changes: 0 additions & 24 deletions src/main/java/dev/vality/testcontainers/annotations/kafka/BitnamiKafkaContainer.java
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/java/dev/vality/testcontainers/annotations/kafka/KafkaTestcontainerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ private KafkaContainerExtension getOrCreateSingletonContainer(Provider provider,

private KafkaContainerExtension create(Provider provider, List<String> topics) {
return switch (provider) {
case BITNAMI -> {
try (var container = new BitnamiKafkaContainer(topics)) {
yield container;
}
}
case APACHE -> {
try (var container = new ApacheKafkaContainer(topics)) {
yield container;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/vality/testcontainers/annotations/kafka/KafkaTestcontainerSingleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.apache.kafka.clients.admin.AdminClient;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down Expand Up @@ -107,6 +108,7 @@
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@ExtendWith(KafkaTestcontainerExtension.class)
@DirtiesContext
public @interface KafkaTestcontainerSingleton {

/**
Expand Down
1 change: 0 additions & 1 deletion src/main/java/dev/vality/testcontainers/annotations/kafka/constants/Provider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

public enum Provider {
APACHE,
BITNAMI,
CONFLUENT
}
2 changes: 2 additions & 0 deletions src/main/java/dev/vality/testcontainers/annotations/minio/MinioTestcontainerSingleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down Expand Up @@ -39,6 +40,7 @@
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@ExtendWith(MinioTestcontainerExtension.class)
@DirtiesContext
public @interface MinioTestcontainerSingleton {

/**
Expand Down
2 changes: 2 additions & 0 deletions ...va/dev/vality/testcontainers/annotations/opensearch/OpensearchTestcontainerSingleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -11,6 +12,7 @@
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@ExtendWith(OpensearchTestcontainerExtension.class)
@DirtiesContext
public @interface OpensearchTestcontainerSingleton {

/**
Expand Down
2 changes: 2 additions & 0 deletions ...va/dev/vality/testcontainers/annotations/postgresql/PostgresqlTestcontainerSingleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down Expand Up @@ -42,6 +43,7 @@
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@ExtendWith(PostgresqlTestcontainerExtension.class)
@DirtiesContext
public @interface PostgresqlTestcontainerSingleton {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/vality/testcontainers/annotations/util/ValuesGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import dev.vality.geck.common.util.TypeUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
import org.apache.commons.io.IOUtils;

import java.io.IOException;
import java.io.InputStream;
Expand Down
94 changes: 0 additions & 94 deletions src/main/java/org/testcontainers/kafka/BitnamiKafkaContainer.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/resources/testcontainers-annotations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ testcontainers:
postgresql:
tag: '17'
kafka:
bitnami:
tag: '3.8'
apache:
tag: '3.8.0'
confluent:
Expand Down