removed dependency on testcontainers-redis

Author: github-actions[bot]

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.redislabs</groupId>
     <artifactId>redis-enterprise-kafka</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.2.0-SNAPSHOT</version>
     <name>Redis Enterprise Kafka Connector</name>
     <description>Kafka Connect source and sink connectors for Redis Enterprise</description>
     <url>https://github.com/RedisLabs-Field-Engineering/redis-enterprise-kafka</url>
@@ -55,11 +55,6 @@
             <id>confluent</id>
             <url>http://packages.confluent.io/maven/</url>
         </repository>
-        <repository>
-            <id>github</id>
-            <name>GitHub Packages</name>
-            <url>https://maven.pkg.github.com/redis-developer/registry</url>
-        </repository>
     </repositories>
     <dependencies>
         <dependency>
@@ -129,15 +124,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.redislabs</groupId>
-            <artifactId>testcontainers-redis</artifactId>
-            <version>1.1.6</version>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>1.15.3-REDISLABS</version>
+            <version>1.15.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -291,7 +286,7 @@
                             <documentationUrl>https://redislabs-field-engineering.github.io/redis-enterprise-kafka/
                             </documentationUrl>
                             <ownerLogo>src/docs/asciidoc/images/redislabs.svg</ownerLogo>
-                            <ownerUsername>jruaux</ownerUsername>
+                            <ownerUsername>redislabs</ownerUsername>
                             <ownerName>Redis Labs</ownerName>
                             <ownerUrl>https://redislabs.com</ownerUrl>
                             <sourceUrl>${project.scm.url}</sourceUrl>

src/test/integration/java/com/redislabs/testcontainers/RedisContainer.java

@@ -0,0 +1,32 @@
+package com.redislabs.testcontainers;
+
+import com.redislabs.testcontainers.support.AbstractRedisContainer;
+import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.utility.MountableFile;
+
+public class RedisContainer extends AbstractRedisContainer<RedisContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redis");
+    private static final String DEFAULT_TAG = "latest";
+
+    public RedisContainer() {
+        this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
+    }
+
+    protected RedisContainer(final DockerImageName dockerImageName) {
+        super(dockerImageName);
+    }
+
+    @Override
+    public boolean isCluster() {
+        return false;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <C extends RedisContainer> C withKeyspaceNotifications() {
+        withCopyFileToContainer(MountableFile.forClasspathResource("redis-keyspace-notifications.conf"), "/data/redis.conf");
+        withCommand("redis-server", "/data/redis.conf");
+        return (C) this;
+    }
+
+}

src/test/integration/java/com/redislabs/testcontainers/RedisServer.java

@@ -0,0 +1,19 @@
+package com.redislabs.testcontainers;
+
+import org.testcontainers.containers.GenericContainer;
+
+public interface RedisServer {
+
+    String getRedisURI();
+
+    boolean isCluster();
+
+    static String redisURI(String host, int port) {
+        return "redis://" + host + ":" + port;
+    }
+
+    static String redisURI(GenericContainer<?> container) {
+        return redisURI(container.getHost(), container.getFirstMappedPort());
+    }
+
+}

src/test/integration/java/com/redislabs/testcontainers/support/AbstractRedisContainer.java

@@ -0,0 +1,38 @@
+package com.redislabs.testcontainers.support;
+
+import com.redislabs.testcontainers.RedisServer;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.shaded.org.apache.commons.lang.ClassUtils;
+import org.testcontainers.utility.DockerImageName;
+
+public abstract class AbstractRedisContainer<C extends AbstractRedisContainer<C>> extends GenericContainer<C> implements RedisServer {
+
+    public static final int REDIS_PORT = 6379;
+
+    protected AbstractRedisContainer(final DockerImageName dockerImageName) {
+        this(dockerImageName, REDIS_PORT);
+    }
+
+    protected AbstractRedisContainer(final DockerImageName dockerImageName, int port) {
+        super(dockerImageName);
+        withExposedPorts(port);
+        waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\n", 1));
+    }
+
+    /**
+     * Get Redis URI.
+     *
+     * @return Redis URI.
+     */
+    @Override
+    public String getRedisURI() {
+        return RedisServer.redisURI(this);
+    }
+
+    @Override
+    public String toString() {
+        return ClassUtils.getShortClassName(getClass());
+    }
+
+}

src/test/resources/redis-keyspace-notifications.conf

@@ -0,0 +1 @@
+notify-keyspace-events AK