Merge branch 'main' into bugfix/Allow-configuring-AlwaysPullPolicy

Author: eddumelendez

docs/examples/junit4/generic/src/test/java/generic/support/TestSpecificImageNameSubstitutor.java

@@ -13,7 +13,7 @@ public class TestSpecificImageNameSubstitutor extends ImageNameSubstitutor {
     @Override
     public DockerImageName apply(final DockerImageName original) {
         if (original.equals(DockerImageName.parse("registry.mycompany.com/mirror/mysql:8.0.36"))) {
-            return DockerImageName.parse("mysql");
+            return DockerImageName.parse("mysql:8.0.36");
         } else {
             return original;
         }

modules/grafana/build.gradle

@@ -8,3 +8,9 @@ dependencies {
     testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4'
     testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6'
 }
+
+tasks.japicmp {
+    methodExcludes = [
+        "org.testcontainers.grafana.LgtmStackContainer#getPromehteusHttpUrl()"
+    ]
+}

modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java

@@ -58,7 +58,7 @@ public String getOtlpHttpUrl() {
         return "http://" + getHost() + ":" + getMappedPort(OTLP_HTTP_PORT);
     }
 
-    public String getPromehteusHttpUrl() {
+    public String getPrometheusHttpUrl() {
         return "http://" + getHost() + ":" + getMappedPort(PROMETHEUS_PORT);
     }
 

modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java

@@ -46,7 +46,7 @@ public void shouldPublishMetric() throws Exception {
                     Response response = RestAssured
                         .given()
                         .queryParam("query", "test_counter_total{job=\"testcontainers\"}")
-                        .get(String.format("%s/api/v1/query", lgtm.getPromehteusHttpUrl()))
+                        .get(String.format("%s/api/v1/query", lgtm.getPrometheusHttpUrl()))
                         .prettyPeek()
                         .thenReturn();
                     assertThat(response.getStatusCode()).isEqualTo(200);