Skip to content

Commit 8eea9a9

Browse files
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]>
1 parent 85f7800 commit 8eea9a9

File tree

6 files changed

+5
-20
lines changed
  • examples
    • example-exemplars-tail-sampling
    • example-exporter-servlet-tomcat
  • integration-tests/it-exporter

6 files changed

+5
-20
lines changed

examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.apache.tomcat.embed</groupId>
4040
<artifactId>tomcat-embed-core</artifactId>
41-
<version>11.0.1</version>
41+
<version>11.0.2</version>
4242
</dependency>
4343
</dependencies>
4444

examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.apache.tomcat.embed</groupId>
4040
<artifactId>tomcat-embed-core</artifactId>
41-
<version>11.0.1</version>
41+
<version>11.0.2</version>
4242
</dependency>
4343
</dependencies>
4444

examples/example-exporter-servlet-tomcat/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.apache.tomcat.embed</groupId>
4040
<artifactId>tomcat-embed-core</artifactId>
41-
<version>11.0.1</version>
41+
<version>11.0.2</version>
4242
</dependency>
4343
</dependencies>
4444

integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>org.apache.tomcat.embed</groupId>
3535
<artifactId>tomcat-embed-core</artifactId>
36-
<version>11.0.1</version>
36+
<version>11.0.2</version>
3737
</dependency>
3838
</dependencies>
3939

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java

+1-9
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@ public void testErrorHandling() throws IOException {
142142
assertThat(response.stringBody()).contains("Simulating an error.");
143143
}
144144

145-
protected boolean headReturnsContentLength() {
146-
return true;
147-
}
148-
149145
@Test
150146
public void testHeadRequest() throws IOException {
151147
start();
@@ -154,11 +150,7 @@ public void testHeadRequest() throws IOException {
154150
assertThat(size).isGreaterThan(0);
155151
Response headResponse = scrape("HEAD", "");
156152
assertThat(headResponse.status).isEqualTo(200);
157-
if (headReturnsContentLength()) {
158-
assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size));
159-
} else {
160-
assertThat(headResponse.getHeader("Content-Length")).isNull();
161-
}
153+
assertThat(headResponse.getHeader("Content-Length")).isEqualTo(Integer.toString(size));
162154
assertThat(headResponse.body).isEmpty();
163155
}
164156

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/TomcatIT.java

-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,4 @@ class TomcatIT extends ExporterIT {
77
public TomcatIT() throws IOException, URISyntaxException {
88
super("exporter-servlet-tomcat-sample");
99
}
10-
11-
@Override
12-
protected boolean headReturnsContentLength() {
13-
// not any more since
14-
// https://tomcat.apache.org/tomcat-11.0-doc/changelog.html#Tomcat_11.0.0-M3_(markt)
15-
return false;
16-
}
1710
}

0 commit comments

Comments
 (0)