Skip to content

Commit 92f8344

Browse files
fix(deps): update dependency org.apache.tomcat.embed:tomcat-embed-core to v11.0.25 (#2389)
This PR contains the following updates: | Package | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) | |---|---|---|---| | [org.apache.tomcat.embed:tomcat-embed-core](https://tomcat.apache.org/) | `11.0.24` → `11.0.25` | ![age](https://developer.mend.io/api/mc/badges/age/maven/org.apache.tomcat.embed:tomcat-embed-core/11.0.25?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.apache.tomcat.embed:tomcat-embed-core/11.0.24/11.0.25?slim=true) | --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/prometheus/client_java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0NC4zMi42IiwidXBkYXRlZEluVmVyIjoiNDQuMzIuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19--> --------- Signed-off-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com>
1 parent ba8f5eb commit 92f8344

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

  • examples
    • example-exemplars-tail-sampling
      • example-greeting-service
        • src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting
      • example-hello-world-app
    • example-exporter-servlet-tomcat
  • integration-tests/it-exporter/it-exporter-servlet-tomcat-sample

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.apache.tomcat.embed</groupId>
4747
<artifactId>tomcat-embed-core</artifactId>
48-
<version>11.0.24</version>
48+
<version>11.0.25</version>
4949
</dependency>
5050
</dependencies>
5151

‎examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException {
2020
Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
2121

2222
Tomcat.addServlet(ctx, "hello", new GreetingServlet());
23-
ctx.addServletMappingDecoded("/*", "hello");
23+
ctx.addServletMapping("/*", "hello");
2424

2525
Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
26-
ctx.addServletMappingDecoded("/metrics", "metrics");
26+
ctx.addServletMapping("/metrics", "metrics");
2727

2828
tomcat.getConnector();
2929
tomcat.start();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.apache.tomcat.embed</groupId>
4747
<artifactId>tomcat-embed-core</artifactId>
48-
<version>11.0.24</version>
48+
<version>11.0.25</version>
4949
</dependency>
5050
</dependencies>
5151

‎examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException {
2020
Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
2121

2222
Tomcat.addServlet(ctx, "hello", new HelloWorldServlet());
23-
ctx.addServletMappingDecoded("/*", "hello");
23+
ctx.addServletMapping("/*", "hello");
2424

2525
Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
26-
ctx.addServletMappingDecoded("/metrics", "metrics");
26+
ctx.addServletMapping("/metrics", "metrics");
2727

2828
tomcat.getConnector();
2929
tomcat.start();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.apache.tomcat.embed</groupId>
4646
<artifactId>tomcat-embed-core</artifactId>
47-
<version>11.0.24</version>
47+
<version>11.0.25</version>
4848
</dependency>
4949
</dependencies>
5050

‎examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public static void main(String[] args) throws LifecycleException, IOException {
2424
Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
2525

2626
Tomcat.addServlet(ctx, "hello", new HelloWorldServlet());
27-
ctx.addServletMappingDecoded("/*", "hello");
27+
ctx.addServletMapping("/*", "hello");
2828

2929
Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
30-
ctx.addServletMappingDecoded("/metrics", "metrics");
30+
ctx.addServletMapping("/metrics", "metrics");
3131

3232
tomcat.getConnector();
3333
tomcat.start();

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

Lines changed: 1 addition & 1 deletion
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.24</version>
36+
<version>11.0.25</version>
3737
</dependency>
3838
</dependencies>
3939

‎integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private static void run(Mode mode, int port) throws IOException, LifecycleExcept
7878
tomcat.setBaseDir(tmpDir.toFile().getAbsolutePath());
7979
Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
8080
Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
81-
ctx.addServletMappingDecoded("/metrics", "metrics");
81+
ctx.addServletMapping("/metrics", "metrics");
8282

8383
tomcat.getConnector();
8484
tomcat.start();

0 commit comments

Comments
 (0)