diff --git a/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarIT.java b/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarIT.java index badfdc1a0..8f0077e2d 100644 --- a/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarIT.java +++ b/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarIT.java @@ -59,7 +59,7 @@ void setupDependencies(@Observes ConnectorStartedEvent event) throws IOException void connectorCompleted(@Observes ConnectorCompletedEvent event) throws Exception { if (!event.isSuccess()) { - throw (Exception) event.getError().get(); + throw new RuntimeException(event.getError().get()); } } diff --git a/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarTestResourceLifecycleManager.java b/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarTestResourceLifecycleManager.java index 74f6fdf0f..be677d0db 100644 --- a/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarTestResourceLifecycleManager.java +++ b/debezium-server/debezium-server-pulsar/src/test/java/io/debezium/server/pulsar/PulsarTestResourceLifecycleManager.java @@ -15,7 +15,6 @@ import org.testcontainers.containers.wait.strategy.Wait; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; -import org.testcontainers.utility.MountableFile; public class PulsarTestResourceLifecycleManager implements QuarkusTestResourceLifecycleManager { @@ -27,9 +26,8 @@ public class PulsarTestResourceLifecycleManager implements QuarkusTestResourceLi private static final GenericContainer container = new GenericContainer<>(PULSAR_IMAGE) .withStartupTimeout(Duration.ofSeconds(90)) .waitingFor(Wait.forLogMessage(".*messaging service is ready.*", 1)) - .withCommand("/pulsar/bin/pulsar", "standalone") - .withCopyFileToContainer(MountableFile.forHostPath("/docker/conf/"), "/pulsar/conf") -// .withClasspathResourceMapping("/docker/conf/", "/pulsar/conf", BindMode.READ_ONLY) + .withCommand("bin/pulsar", "standalone") + .withClasspathResourceMapping("/docker/conf/", "/pulsar/conf", BindMode.READ_ONLY) .withExposedPorts(PULSAR_PORT, PULSAR_HTTP_PORT); @Override @@ -55,6 +53,6 @@ public void stop() { } public static String getPulsarServiceUrl() { - return "pulsar://localhost:" + container.getExposedPorts().get(0); + return "pulsar://localhost:" + container.getMappedPort(PULSAR_PORT); } } diff --git a/debezium-server/debezium-server-pulsar/docker/conf/bkenv.sh b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/bkenv.sh similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/bkenv.sh rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/bkenv.sh diff --git a/debezium-server/debezium-server-pulsar/docker/conf/bookkeeper.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/bookkeeper.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/bookkeeper.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/bookkeeper.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/broker.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/broker.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/broker.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/broker.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/client.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/client.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/client.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/client.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/discovery.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/discovery.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/discovery.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/discovery.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/filesystem_offload_core_site.xml b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/filesystem_offload_core_site.xml similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/filesystem_offload_core_site.xml rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/filesystem_offload_core_site.xml diff --git a/debezium-server/debezium-server-pulsar/docker/conf/functions-logging/console_logging_config.ini b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/functions-logging/console_logging_config.ini similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/functions-logging/console_logging_config.ini rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/functions-logging/console_logging_config.ini diff --git a/debezium-server/debezium-server-pulsar/docker/conf/functions-logging/logging_config.ini b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/functions-logging/logging_config.ini similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/functions-logging/logging_config.ini rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/functions-logging/logging_config.ini diff --git a/debezium-server/debezium-server-pulsar/docker/conf/functions_worker.yml b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/functions_worker.yml similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/functions_worker.yml rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/functions_worker.yml diff --git a/debezium-server/debezium-server-pulsar/docker/conf/global_zookeeper.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/global_zookeeper.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/global_zookeeper.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/global_zookeeper.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/log4j2-scripts/filter.js b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/log4j2-scripts/filter.js similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/log4j2-scripts/filter.js rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/log4j2-scripts/filter.js diff --git a/debezium-server/debezium-server-pulsar/docker/conf/log4j2.yaml b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/log4j2.yaml similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/log4j2.yaml rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/log4j2.yaml diff --git a/debezium-server/debezium-server-pulsar/docker/conf/presto/catalog/pulsar.properties b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/catalog/pulsar.properties similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/presto/catalog/pulsar.properties rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/catalog/pulsar.properties diff --git a/debezium-server/debezium-server-pulsar/docker/conf/presto/config.properties b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/config.properties similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/presto/config.properties rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/config.properties diff --git a/debezium-server/debezium-server-pulsar/docker/conf/presto/jvm.config b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/jvm.config similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/presto/jvm.config rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/jvm.config diff --git a/debezium-server/debezium-server-pulsar/docker/conf/presto/log.properties b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/log.properties similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/presto/log.properties rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/presto/log.properties diff --git a/debezium-server/debezium-server-pulsar/docker/conf/proxy.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/proxy.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/proxy.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/proxy.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/pulsar_env.sh b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/pulsar_env.sh similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/pulsar_env.sh rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/pulsar_env.sh diff --git a/debezium-server/debezium-server-pulsar/docker/conf/pulsar_tools_env.sh b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/pulsar_tools_env.sh similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/pulsar_tools_env.sh rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/pulsar_tools_env.sh diff --git a/debezium-server/debezium-server-pulsar/docker/conf/schema_example.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/schema_example.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/schema_example.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/schema_example.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/standalone.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/standalone.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/standalone.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/standalone.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/websocket.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/websocket.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/websocket.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/websocket.conf diff --git a/debezium-server/debezium-server-pulsar/docker/conf/zookeeper.conf b/debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/zookeeper.conf similarity index 100% rename from debezium-server/debezium-server-pulsar/docker/conf/zookeeper.conf rename to debezium-server/debezium-server-pulsar/src/test/resources/docker/conf/zookeeper.conf