This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 626d87f58e90a45c88cb09ecd631eb534ab1e9cc Author: James Netherton <[email protected]> AuthorDate: Thu Jan 8 15:33:49 2026 +0000 Upgrade GreenMail container image to 2.1.8 Fixes #8109 --- .../org/apache/camel/quarkus/component/mail/MailTest.java | 15 +++++++-------- .../camel/quarkus/component/mail/MailTestResource.java | 7 +++++-- pom.xml | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java index 148b0b3ae6..24dd1a484f 100644 --- a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java +++ b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTest.java @@ -47,7 +47,7 @@ import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -81,19 +81,18 @@ public class MailTest { + "Hello attachment!" + "${delimiter}--\r\n"; - @BeforeEach - public void beforeEach() { + @BeforeAll + public static void beforeAll() { // Configure users Config config = ConfigProvider.getConfig(); String userJson = String.format("{ \"email\": \"%s\", \"login\": \"%s\", \"password\": \"%s\"}", EMAIL_ADDRESS, USERNAME, PASSWORD); + RestAssured.given() .contentType(ContentType.JSON) .body(userJson) .post("http://"; + config.getValue("mail.host", String.class) + ":" - + config.getValue("mail.api.port", Integer.class) + "/api/user") - .then() - .statusCode(200); + + config.getValue("mail.api.port", Integer.class) + "/api/user"); } @AfterEach @@ -102,10 +101,10 @@ public class MailTest { Config config = ConfigProvider.getConfig(); RestAssured.given() .post("http://"; + config.getValue("mail.host", String.class) + ":" - + config.getValue("mail.api.port", Integer.class) + "/api/service/reset") + + config.getValue("mail.api.port", Integer.class) + "/api/mail/purge") .then() .statusCode(200) - .body("message", is("Performed reset")); + .body("message", is("Purged mails")); RestAssured.get("/mail/stopConsumers") .then() diff --git a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java index 0269f7ab87..a8e6675b79 100644 --- a/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java +++ b/integration-tests/mail/src/test/java/org/apache/camel/quarkus/component/mail/MailTestResource.java @@ -25,13 +25,15 @@ import java.util.Map; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; import org.apache.camel.quarkus.test.support.certificate.CertificatesUtil; import org.eclipse.microprofile.config.ConfigProvider; -import org.jboss.logging.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.HttpWaitStrategy; import org.testcontainers.utility.MountableFile; public class MailTestResource implements QuarkusTestResourceLifecycleManager { - private static final Logger LOG = Logger.getLogger(MailTestResource.class); + private static final Logger LOG = LoggerFactory.getLogger(MailTestResource.class); private static final String GREENMAIL_IMAGE_NAME = ConfigProvider.getConfig().getValue("greenmail.container.image", String.class); //default value used in testcontainer @@ -42,6 +44,7 @@ public class MailTestResource implements QuarkusTestResourceLifecycleManager { @Override public Map<String, String> start() { container = new GenericContainer<>(GREENMAIL_IMAGE_NAME) + .withLogConsumer(new Slf4jLogConsumer(LOG)) .withCopyToContainer(MountableFile.forHostPath(CertificatesUtil.keystoreFile("greenmail", "p12")), "/home/greenmail/greenmail.p12") .withExposedPorts(MailProtocol.allPorts()) diff --git a/pom.xml b/pom.xml index 2f7285fe74..96e55f98e8 100644 --- a/pom.xml +++ b/pom.xml @@ -246,7 +246,7 @@ <fhir-dstu.container.image>${fhir.container.image.base}:v4.2.0</fhir-dstu.container.image> <google-cloud-sdk.container.image>gcr.io/google.com/cloudsdktool/cloud-sdk:551.0.0-emulators</google-cloud-sdk.container.image> <google-storage.container.image>mirror.gcr.io/fsouza/fake-gcs-server:1.52.3</google-storage.container.image> - <greenmail.container.image>mirror.gcr.io/greenmail/standalone:2.0.0</greenmail.container.image> + <greenmail.container.image>mirror.gcr.io/greenmail/standalone:2.1.8</greenmail.container.image> <hashicorp-vault.container.image>mirror.gcr.io/hashicorp/vault:1.20.4</hashicorp-vault.container.image> <ibm-mq.container.image>icr.io/ibm-messaging/mq:9.4.3.0-r1</ibm-mq.container.image> <influxdb.container.image>mirror.gcr.io/influxdb:1.12.2-alpine</influxdb.container.image>
