Bump org.apache.tomcat.embed:tomcat-embed-core from 10.1.30 to 11.0.0 (…

…#1146) * Bump org.apache.tomcat.embed:tomcat-embed-core from 10.1.30 to 11.0.0 Bumps org.apache.tomcat.embed:tomcat-embed-core from 10.1.30 to 11.0.0. --- updated-dependencies: - dependency-name: org.apache.tomcat.embed:tomcat-embed-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix tomcat Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
prometheus · Oct 16, 2024 · 0f32c67 · 0f32c67
1 parent c9ff46b
commit 0f32c67
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 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>10.1.30</version>
+            <version>11.0.0</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>10.1.30</version>
+            <version>11.0.0</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>10.1.30</version>
+            <version>11.0.0</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>10.1.30</version>
+            <version>11.0.0</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
@@ -176,6 +176,10 @@ public void testErrorHandling() throws IOException {
     assertThat(new String(response.body, UTF_8)).contains("Simulating an error.");
   }
 
+  protected boolean headReturnsContentLength() {
+    return true;
+  }
+
   @Test
   public void testHeadRequest() throws IOException {
     sampleAppContainer
@@ -186,7 +190,11 @@ public void testHeadRequest() throws IOException {
     assertThat(size > 0).isTrue();
     Response headResponse = scrape("HEAD", "");
     assertThat(headResponse.status).isEqualTo(200);
-    assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size));
+    if (headReturnsContentLength()) {
+      assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size));
+    } else {
+      assertThat(headResponse.getHeader("Content-Length")).isNull();
+    }
     assertThat(headResponse.body.length).isZero();
   }
 

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,4 +7,11 @@ 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;
+  }
 }