Merge branch 'main' into dependabot/maven/org.apache.maven.plugins-maven-release-plugin-3.1.1

Author: oleg-nenashev

Diff for: pom.xml

@@ -33,8 +33,8 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <wiremock.version>3.5.4</wiremock.version>
-    <testcontainers.version>1.19.8</testcontainers.version>
-    <junit.version>5.10.2</junit.version>
+    <testcontainers.version>1.20.3</testcontainers.version>
+    <junit.version>5.12.1</junit.version>
     <assertj.version>3.26.3</assertj.version>
     <awaitility.version>4.2.2</awaitility.version>
     <project.scm.id>github</project.scm.id>
@@ -67,7 +67,7 @@
         <!-- Fix dependency convergence [logback-classic vs junit] -->
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>2.0.15</version>
+        <version>2.0.17</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -147,7 +147,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.11.2</version>
         <executions>
           <execution>
             <id>attach-javadocs</id>
@@ -237,7 +237,7 @@
       <id>release</id>
       <properties>
           <version.maven-release-plugin>3.1.1</version.maven-release-plugin>
-          <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+          <version.maven-gpg-plugin>3.2.7</version.maven-gpg-plugin>
       </properties>
       <build>
           <pluginManagement>

Diff for: src/main/java/org/wiremock/integrations/testcontainers/WireMockContainer.java

@@ -63,16 +63,18 @@ public class WireMockContainer extends GenericContainer<WireMockContainer> {
     private static final String FILES_DIR = "/home/wiremock/__files/";
 
     private static final String EXTENSIONS_DIR = "/var/wiremock/extensions/";
+    private static final int PORT = 8080;
     private static final WaitStrategy DEFAULT_WAITER = Wait
             .forHttp("/__admin/mappings")
             .withMethod("GET")
-            .forStatusCode(200);
+            .forStatusCode(200)
+            .forPort(PORT);
 
     private static final WaitStrategy HEALTH_CHECK_ENDPOINT_WAITER = Wait
             .forHttp("/__admin/health")
             .withMethod("GET")
-            .forStatusCode(200);
-    private static final int PORT = 8080;
+            .forStatusCode(200)
+            .forPort(PORT);
     private final StringBuilder wireMockArgs;
     private final Map<String, Stub> mappingStubs = new HashMap<>();
     private final Map<String, MountableFile> mappingFiles = new HashMap<>();
@@ -371,7 +373,7 @@ public Integer getPort() {
     @Override
     protected void configure() {
         super.configure();
-        withExposedPorts(PORT);
+        addExposedPorts(PORT);
         for (Stub stub : mappingStubs.values()) {
             withCopyToContainer(Transferable.of(stub.json), MAPPINGS_DIR + stub.name + ".json");
         }

Diff for: src/test/java/org/wiremock/integrations/testcontainers/WireMockContainerJunit4Test.java

@@ -24,11 +24,15 @@
 
 public class WireMockContainerJunit4Test {
 
+    private static final int WIREMOCK_DEFAULT_PORT = 8080;
+    private static final int ADDITIONAL_MAPPED_PORT = 8443;
+
     @Rule
     public WireMockContainer wiremockServer = new WireMockContainer(TestConfig.WIREMOCK_DEFAULT_IMAGE)
             .withMapping("hello", WireMockContainerTest.class, "hello-world.json")
             .withMapping("hello-resource", WireMockContainerTest.class, "hello-world-resource.json")
-            .withFileFromResource("hello-world-resource-response.xml", WireMockContainerTest.class, "hello-world-resource-response.xml");
+            .withFileFromResource("hello-world-resource-response.xml", WireMockContainerTest.class, "hello-world-resource-response.xml")
+            .withExposedPorts(ADDITIONAL_MAPPED_PORT);
 
     @Test
     public void helloWorld() throws Exception {
@@ -71,4 +75,15 @@ public void helloWorldFromFile() throws Exception {
                 .as("Wrong response body")
                 .contains("Hello, world!");
     }
+
+    @Test
+    public void customPortsAreExposed() {
+        //given
+
+        //when
+
+        //then
+        assertThat(wiremockServer.getExposedPorts())
+                .contains(WIREMOCK_DEFAULT_PORT, ADDITIONAL_MAPPED_PORT);
+    }
 }

Diff for: src/test/java/org/wiremock/integrations/testcontainers/WireMockContainerTest.java

@@ -28,12 +28,16 @@
 @Testcontainers(parallel = true)
 class WireMockContainerTest {
 
+    private static final int WIREMOCK_DEFAULT_PORT = 8080;
+    private static final int ADDITIONAL_MAPPED_PORT = 8443;
+
     @Container
     WireMockContainer wiremockServer = new WireMockContainer(TestConfig.WIREMOCK_DEFAULT_IMAGE)
             .withMapping("hello", WireMockContainerTest.class, "hello-world.json")
             .withMapping("hello-resource", WireMockContainerTest.class, "hello-world-resource.json")
             .withFileFromResource("hello-world-resource-response.xml", WireMockContainerTest.class,
-                    "hello-world-resource-response.xml");
+                    "hello-world-resource-response.xml")
+            .withExposedPorts(ADDITIONAL_MAPPED_PORT);
 
 
     @ParameterizedTest
@@ -67,4 +71,15 @@ void helloWorldFromFile() throws Exception {
                 .as("Wrong response body")
                 .contains("Hello, world!");
     }
+
+    @Test
+    void customPortsAreExposed() {
+        //given
+
+        //when
+
+        //then
+        assertThat(wiremockServer.getExposedPorts())
+                .contains(WIREMOCK_DEFAULT_PORT, ADDITIONAL_MAPPED_PORT);
+    }
 }