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] <[email protected]> * tomcat fixed headers Signed-off-by: Gregor Zeitlinger <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Gregor Zeitlinger <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <[email protected]>
prometheus · Dec 12, 2024 · 8eea9a9 · 8eea9a9
1 parent 85f7800
commit 8eea9a9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 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
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.1</version>
+            <version>11.0.2</version>
         </dependency>
     </dependencies>
 

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
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.1</version>
+            <version>11.0.2</version>
         </dependency>
     </dependencies>
 

diff --git a/examples/example-exporter-servlet-tomcat/pom.xml b/examples/example-exporter-servlet-tomcat/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.1</version>
+            <version>11.0.2</version>
         </dependency>
     </dependencies>
 

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
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
-            <version>11.0.1</version>
+            <version>11.0.2</version>
         </dependency>
     </dependencies>
 

diff --git a/...ter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java b/...ter/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/...orter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/TomcatIT.java b/...orter/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;
-  }
 }