From 8eea9a9562d2229fc2257118f5d2cf417225d09b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 13:48:43 +0100 Subject: [PATCH] Bump org.apache.tomcat.embed:tomcat-embed-core from 11.0.1 to 11.0.2 (#1224) * Bump org.apache.tomcat.embed:tomcat-embed-core from 11.0.1 to 11.0.2 Bumps org.apache.tomcat.embed:tomcat-embed-core from 11.0.1 to 11.0.2. --- updated-dependencies: - dependency-name: org.apache.tomcat.embed:tomcat-embed-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * tomcat fixed headers Signed-off-by: Gregor Zeitlinger --------- Signed-off-by: dependabot[bot] Signed-off-by: Gregor Zeitlinger Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger --- .../example-greeting-service/pom.xml | 2 +- .../example-hello-world-app/pom.xml | 2 +- examples/example-exporter-servlet-tomcat/pom.xml | 2 +- .../it-exporter-servlet-tomcat-sample/pom.xml | 2 +- .../metrics/it/exporter/test/ExporterIT.java | 10 +--------- .../prometheus/metrics/it/exporter/test/TomcatIT.java | 7 ------- 6 files changed, 5 insertions(+), 20 deletions(-) diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml index 9aab1d452..86f08018c 100644 --- a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml +++ b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml @@ -38,7 +38,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.1 + 11.0.2 diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml index 40efc62f1..0b0122cdb 100644 --- a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml +++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml @@ -38,7 +38,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.1 + 11.0.2 diff --git a/examples/example-exporter-servlet-tomcat/pom.xml b/examples/example-exporter-servlet-tomcat/pom.xml index 355f8e830..39b505f30 100644 --- a/examples/example-exporter-servlet-tomcat/pom.xml +++ b/examples/example-exporter-servlet-tomcat/pom.xml @@ -38,7 +38,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.1 + 11.0.2 diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml index 78a94b724..2af2a5928 100644 --- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml +++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml @@ -33,7 +33,7 @@ org.apache.tomcat.embed tomcat-embed-core - 11.0.1 + 11.0.2 diff --git a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java index 38ebf8f31..199bc3387 100644 --- a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java +++ b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java @@ -142,10 +142,6 @@ public void testErrorHandling() throws IOException { assertThat(response.stringBody()).contains("Simulating an error."); } - protected boolean headReturnsContentLength() { - return true; - } - @Test public void testHeadRequest() throws IOException { start(); @@ -154,11 +150,7 @@ public void testHeadRequest() throws IOException { assertThat(size).isGreaterThan(0); Response headResponse = scrape("HEAD", ""); assertThat(headResponse.status).isEqualTo(200); - if (headReturnsContentLength()) { - assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size)); - } else { - assertThat(headResponse.getHeader("Content-Length")).isNull(); - } + assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size)); assertThat(headResponse.body).isEmpty(); } diff --git a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/TomcatIT.java b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/TomcatIT.java index 731e7fa3a..ea5e6b69d 100644 --- a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/TomcatIT.java +++ b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/TomcatIT.java @@ -7,11 +7,4 @@ class TomcatIT extends ExporterIT { public TomcatIT() throws IOException, URISyntaxException { super("exporter-servlet-tomcat-sample"); } - - @Override - protected boolean headReturnsContentLength() { - // not any more since - // https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.0-M3_(markt) - return false; - } }