.github/renovate/renovate.json

@@ -25,8 +25,9 @@
       "description": "Process update docker images",
       "fileMatch": [
         "^.*Properties\\.java$",
+        "^.*\\.properties",
         "^.*\\.adoc",
-        "^.*additional-spring-configuration-metadata.json"
+        "^.*additional-spring-configuration-metadata\\.json"
       ],
       "matchStrings": [
         "\\/\\/.*?renovate:.*?datasource=(?<datasource>.*?)\\s+?return\\s+?\\\"(?<depName>.*?):?(?<currentValue>[\\w+\\.\\-]*)\"",
@@ -61,7 +62,7 @@
     {
       "description": "Process update images in spring configuration metadata",
       "fileMatch": [
-        "^.*additional-spring-configuration-metadata.json"
+        "^.*additional-spring-configuration-metadata\\.json"
       ],
       "matchStrings": [
         "\\\"embedded\\.\\w+?\\.(dockerImage|docker\\-image)\\\",\\s+.*\\s+.*\\s+\\\"value\\\"\\s*?:\\s*?\"(?<depName>.*?):?(?<currentValue>[\\w+\\.\\-]*)\""

.github/workflows/changelog-release-drafter.yml

@@ -10,6 +10,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/maven.yml

@@ -37,7 +37,11 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: '17'
+          distribution: 'corretto'
+          java-version: '21'
       - name: Build with Maven
         run: ./mvnw -version && whoami && umask -S && umask a+rw && umask -S && ./mvnw clean verify -P docker-clean -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 --no-snapshot-updates --batch-mode --no-transfer-progress
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release-support-stream.yml

@@ -12,7 +12,19 @@ on:
       branch:
         description: "Branch to be released"
         required: true
-        type: string
+        default: 'support/2.3.X'
+        type: choice
+        options:
+          - 'support/2.3.X'
+          - 'support/3.0.X'
+      java-version:
+        description: "Java version"
+        required: true
+        default: '21'
+        type: choice
+        options:
+          - '21'
+          - '17'
 
 jobs:
   publish:
@@ -27,8 +39,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: '17'
+          distribution: 'corretto'
+          java-version: ${{github.event.inputs.java-version}}
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
@@ -50,7 +62,7 @@ jobs:
 
       - name: Commit & Push changes
         if: ${{ success() }}
-        uses: actions-js/push@v1.4
+        uses: actions-js/push@v1.5
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           message: 'Release ${{github.event.inputs.version}}'

.github/workflows/release.yml

@@ -17,8 +17,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
-          java-version: '17'
+          distribution: 'corretto'
+          java-version: '21'
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

.github/workflows/renovate.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v39.2.4
+        uses: renovatebot/github-action@v41.0.14
         with:
           configurationFile: .github/renovate/renovate.json
           token: ${{ secrets.RELEASE_PERSONAL_ACCESS_TOKEN }}

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

README.adoc

@@ -1,6 +1,6 @@
 = Testcontainers Spring Boot
 
-https://codecov.io/gh/Playtika/testcontainers-spring-boot[image:https://codecov.io/gh/testcontainers/testcontainers-spring-boot/branch/develop/graph/badge.svg[codecov]]
+https://codecov.io/gh/PlaytikaOSS/testcontainers-spring-boot[image:https://codecov.io/gh/PlaytikaOSS/testcontainers-spring-boot/graph/badge.svg?token=9E0VBFIB5B[codecov]]
 https://maven-badges.herokuapp.com/maven-central/com.playtika.testcontainers/testcontainers-spring-boot[image:https://maven-badges.herokuapp.com/maven-central/com.playtika.testcontainers/testcontainers-spring-boot/badge.svg[Maven Central]]
 
 If you develop services using Spring Boot and maybe Spring Cloud and you do
@@ -16,10 +16,10 @@ Usage of Spring Cloud in your production code is optional, but __you will need i
 |===
 | Spring Boot | Test Containers Spring Boot
 
-|2.4.X, 2.5.X, 2.6.X, 2.7.X
+|2.5.X, 2.6.X, 2.7.X
 |2.X.X
 
-|2.7.X, 3.0.X, 3.1.X
+|3.0.X, 3.1.X
 |3.0.X
 
 |3.2.X

embedded-aerospike-enterprise/README.adoc

@@ -24,7 +24,7 @@ ToxiProxy is a great tool for simulating network conditions, meaning that you ca
 
 * `embedded.aerospike.enabled` `(true|false, default is 'true')`
 * `embedded.aerospike.reuseContainer` `(true|false, default is 'false')`
-* `embedded.aerospike.dockerImage` `(default is set to 'aerospike/aerospike-server-enterprise:6.4.0.10')`
+* `embedded.aerospike.dockerImage` `(default is set to 'aerospike/aerospike-server-enterprise:8.0.0.5')`
 ** Aerospike Enterprise version must be not less then 6.3.0
 * `embedded.aerospike.featureKey` base64 of a feature-key-file https://aerospike.com/docs/server/operations/configure/feature-key, default is null.
 **Warning: if not provided, the Aerospike Database EE evaluation feature key file will be used. That means you can use it internally only for Evaluation

embedded-aerospike-enterprise/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>testcontainers-spring-boot-parent</artifactId>
         <groupId>com.playtika.testcontainers</groupId>
-        <version>3.1.3</version>
+        <version>3.1.11</version>
         <relativePath>../testcontainers-spring-boot-parent</relativePath>
     </parent>
 
@@ -32,10 +32,5 @@
             <groupId>com.playtika.testcontainers</groupId>
             <artifactId>embedded-aerospike</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/AerospikeEnterpriseConfigurer.java

@@ -3,7 +3,6 @@
 import com.playtika.testcontainer.aerospike.AerospikeProperties;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.testcontainers.containers.Container;
 import org.testcontainers.containers.GenericContainer;
 
 import java.io.IOException;
@@ -15,26 +14,29 @@ public class AerospikeEnterpriseConfigurer {
     private final AerospikeProperties aerospikeProperties;
     private final AerospikeEnterpriseProperties enterpriseProperties;
 
-    public void configure(GenericContainer<?> aerospikeContainer)  throws IOException, InterruptedException {
+    public void configure(GenericContainer<?> aerospikeContainer) throws IOException, InterruptedException {
         if (aerospikeProperties.getFeatureKey() == null || aerospikeProperties.getFeatureKey().isBlank()) {
             log.warn("Evaluation feature key file not provided by 'embedded.aerospike.featureKey' property. " +
                     "Pay attention to license details: https://github.com/aerospike/aerospike-server.docker/blob/master/enterprise/ENTERPRISE_LICENSE");
         }
 
-        setupDisallowExpunge(aerospikeContainer);
-    }
-
-    private void setupDisallowExpunge(GenericContainer<?> aerospikeContainer) throws IOException, InterruptedException {
-        if (!enterpriseProperties.isDurableDeletes()) {
-            return;
-        }
-        log.info("Setting up 'disallow-expunge' to true...");
         String namespace = aerospikeProperties.getNamespace();
-        Container.ExecResult result = aerospikeContainer.execInContainer("asadm", "-e",
-                String.format("enable; manage config namespace %s param disallow-expunge to true", namespace));
-        if (result.getStderr().length() > 0) {
-            throw new IllegalStateException("Failed to set up 'disallow-expunge' to true: " + result.getStderr());
+        AsadmCommandExecutor asadmCommandExecutor = new AsadmCommandExecutor(aerospikeContainer);
+
+        /*
+         By default, the value of this metric is 90%, we set it to 100% to prevent stopping writes for the Aerospike
+         Enterprise container during high consumption of system memory. For the Aerospike Community Edition, this metric is not used.
+         Documentation: https://aerospike.com/docs/server/reference/configuration#stop-writes-sys-memory-pct
+        */
+        log.info("Switching off 'stop-writes-sys-memory-pct'... ");
+        asadmCommandExecutor.execute(String.format("manage config namespace %s param stop-writes-sys-memory-pct to 100", namespace));
+        log.info("Success switching off 'stop-writes-sys-memory-pct'");
+
+        if (enterpriseProperties.isDurableDeletes()) {
+            log.info("Setting up 'disallow-expunge' to true...");
+            asadmCommandExecutor.execute(String.format("manage config namespace %s param disallow-expunge to true", namespace));
+            log.info("Success setting up 'disallow-expunge' to true");
         }
-        log.info("Set up 'disallow-expunge' to true: {}", result.getStdout());
     }
+
 }

embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/AsadmCommandExecutor.java

@@ -0,0 +1,40 @@
+package com.playtika.testcontainers.aerospike.enterprise;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.Container;
+import org.testcontainers.containers.GenericContainer;
+
+import java.io.IOException;
+
+@RequiredArgsConstructor
+@Slf4j
+public class AsadmCommandExecutor {
+
+    private final GenericContainer<?> aerospikeContainer;
+
+    public void execute(String command) throws IOException, InterruptedException {
+        Container.ExecResult result = aerospikeContainer.execInContainer("asadm", "--enable", "-e", command);
+        logStdout(result);
+        if (result.getExitCode() != 0 || isBadResponse(result)) {
+            throw new IllegalStateException(String.format("Failed to execute  \"asadm --enable -e '%s'\":\nstdout:\n%s\nstderr:\n%s",
+                    command, result.getStdout(), result.getStderr()));
+        }
+    }
+
+    private boolean isBadResponse(Container.ExecResult execResult) {
+        String stdout = execResult.getStdout();
+        /*
+        Example of the stdout without error:
+        ~Set Namespace Param stop-writes-sys-memory-pct to 100~
+                     Node|Response
+        728bb242e58c:3000|ok
+        Number of rows: 1
+        */
+        return !stdout.contains("|ok");
+    }
+
+    private static void logStdout(Container.ExecResult result) {
+        log.debug("Aerospike asadm util stdout: \n{}\n{}", result.getStdout(), result.getStderr());
+    }
+}

embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/EnterpriseAerospikeTestOperationsAutoConfiguration.java

@@ -21,8 +21,9 @@ public class EnterpriseAerospikeTestOperationsAutoConfiguration {
     @Bean
     @ConditionalOnProperty(value = "embedded.aerospike.time-travel.enabled", havingValue = "true", matchIfMissing = true)
     public ExpiredDocumentsCleaner expiredDocumentsCleaner(IAerospikeClient client,
+                                                           AerospikeEnterpriseProperties aerospikeEnterpriseProperties,
                                                            AerospikeProperties properties) {
-        return new AerospikeExpiredDocumentsCleaner(client, properties.getNamespace(), true);
+        return new AerospikeExpiredDocumentsCleaner(client, properties.getNamespace(), aerospikeEnterpriseProperties.isDurableDeletes());
     }
 
 }

embedded-aerospike-enterprise/src/main/resources/embedded-enterprise-aerospike.properties

@@ -1 +1 @@
-embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.3.0.16
+embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:7.0.0.4

embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/AsadmCommandExecutorTest.java

@@ -0,0 +1,30 @@
+package com.playtika.testcontainers.aerospike.enterprise;
+
+import com.playtika.testcontainer.aerospike.AerospikeProperties;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.testcontainers.containers.GenericContainer;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+public class AsadmCommandExecutorTest extends BaseEnterpriseAerospikeTest {
+
+    @Autowired
+    @Qualifier(AerospikeProperties.BEAN_NAME_AEROSPIKE)
+    private GenericContainer<?> aerospikeContainer;
+
+    @Test
+    public void shouldFailCommandExecutionWithBadOption() {
+        AsadmCommandExecutor commandExecutor = new AsadmCommandExecutor(aerospikeContainer);
+        assertThatExceptionOfType(IllegalStateException.class)
+                .isThrownBy(() -> commandExecutor.execute("-tttttt"));
+    }
+
+    @Test
+    public void shouldFailCommandExecutionWithBadCommand() {
+        AsadmCommandExecutor commandExecutor = new AsadmCommandExecutor(aerospikeContainer);
+        assertThatExceptionOfType(IllegalStateException.class)
+                .isThrownBy(() -> commandExecutor.execute("manage config namespace NAMESPACE_NOT_EXISTS param disallow-expunge to true"));
+    }
+}

embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/ValidateEnterpriseAerospikeBootstrapConfigurationTest.java

@@ -20,13 +20,13 @@ void failOnNonEnterpriseImage() {
 
     @Test
     void failOnUnsuitableEnterpriseImageVersion() {
-        contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.1.0.16_1")
+        contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike/aerospike-server-enterprise:6.1.0.16")
                 .run(context -> assertThat(context).hasFailed());
     }
 
     @Test
     void skipValidation() {
-        contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike-server:6.1.0.16_1",
+        contextRunner.withPropertyValues("embedded.aerospike.dockerImage=aerospike-server:6.1.0.16",
                 "embedded.aerospike.enabled=false")
                 .run(context -> assertThat(context).hasNotFailed());
 

embedded-aerospike-enterprise/src/test/resources/log4j2.xml

@@ -6,7 +6,7 @@
         </Console>
     </Appenders>
     <Loggers>
-        <Logger name="com.playtika.testcontainer" level="info"/>
+        <Logger name="com.playtika.testcontainers" level="info"/>
         <Logger name="org.springframework" level="error"/>
         <Root level="error">
             <AppenderRef ref="Console"/>

embedded-aerospike/README.adoc

@@ -19,7 +19,7 @@ ToxiProxy is a great tool for simulating network conditions, meaning that you ca
 
 * `embedded.aerospike.enabled` `(true|false, default is 'true')`
 * `embedded.aerospike.reuseContainer` `(true|false, default is 'false')`
-* `embedded.aerospike.dockerImage` `(default is set to 'aerospike/aerospike-server:6.4.0.10')`
+* `embedded.aerospike.dockerImage` `(default is set to 'aerospike/aerospike-server:8.0.0.5')`
 ** You can pick wanted version on https://hub.docker.com/_/aerospike/tags[dockerhub]
 * `embedded.aerospike.featureKey` `(base64 of a feature-key-file https://aerospike.com/docs/server/operations/configure/feature-key, default is null) is only required for the EE image`
 * `embedded.aerospike.waitTimeoutInSeconds` `(default is 60 seconds)`

embedded-aerospike/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>testcontainers-spring-boot-parent</artifactId>
         <groupId>com.playtika.testcontainers</groupId>
-        <version>3.1.3</version>
+        <version>3.1.11</version>
         <relativePath>../testcontainers-spring-boot-parent</relativePath>
     </parent>
 

embedded-aerospike/src/main/java/com/playtika/testcontainer/aerospike/AerospikeProperties.java

@@ -24,6 +24,6 @@ public class AerospikeProperties extends CommonContainerProperties {
     public String getDefaultDockerImage() {
         // Please don`t remove this comment.
         // renovate: datasource=docker
-        return "aerospike/aerospike-server:6.4.0.10";
+        return "aerospike/aerospike-server:8.0.0.5";
     }
 }

embedded-artifactory/README.adoc

@@ -16,7 +16,7 @@
 
 * `embedded.artifactory.enabled` `(true|false, default is true)`
 * `embedded.artifactory.reuseContainer` `(true|false, default is false)`
-* `embedded.artifactory.dockerImage` `(default is 'releases-docker.jfrog.io/jfrog/artifactory-oss:7.77.3')`
+* `embedded.artifactory.dockerImage` `(default is 'releases-docker.jfrog.io/jfrog/artifactory-oss:7.77.12')`
 ** Release notes on https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes[jfrog.com]
 * `embedded.artifactory.networkAlias` `(default is 'artifactory')`
 * `embedded.artifactory.username` `(default is 'admin')`

embedded-artifactory/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>testcontainers-spring-boot-parent</artifactId>
         <groupId>com.playtika.testcontainers</groupId>
-        <version>3.1.3</version>
+        <version>3.1.11</version>
         <relativePath>../testcontainers-spring-boot-parent</relativePath>
     </parent>
 

embedded-artifactory/src/main/java/com/playtika/testcontainer/artifactory/ArtifactoryProperties.java

@@ -27,6 +27,6 @@ public ArtifactoryProperties() {
     public String getDefaultDockerImage() {
         // Please don`t remove this comment.
         // renovate: datasource=docker
-        return "releases-docker.jfrog.io/jfrog/artifactory-oss:7.77.3";
+        return "releases-docker.jfrog.io/jfrog/artifactory-oss:7.77.12";
     }
 }

embedded-azurite/README.adoc

@@ -15,7 +15,7 @@
 ==== Consumes (via `bootstrap.properties`)
 * `embedded.azurite.enabled` `(true|false, default is true)`
 * `embedded.azurite.reuseContainer` `(true|false, default is false)`
-* `embedded.azurite.dockerImage` `(default is 'mcr.microsoft.com/azure-storage/azurite')`
+* `embedded.azurite.dockerImage` `(default is 'mcr.microsoft.com/azure-storage/azurite:3.33.0')`
 ** Image versions on https://hub.docker.com/_/microsoft-azure-storage-azurite
 * `embedded.azurite.blobStoragePort` `(default is 10000)`
 * `embedded.azurite.queueStoragePort` `(default is 10001)`

embedded-azurite/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>testcontainers-spring-boot-parent</artifactId>
         <groupId>com.playtika.testcontainers</groupId>
-        <version>3.1.3</version>
+        <version>3.1.11</version>
         <relativePath>../testcontainers-spring-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>