This is an automated email from the ASF dual-hosted git repository. bonampak pushed a commit to branch feature/jakarta-jetty-upgrade in repository https://gitbox.apache.org/repos/asf/knox.git
commit 156286a8a80af65fdfd4724e40623c161d3fbd0d Author: bonampak <[email protected]> AuthorDate: Sat Apr 25 22:36:26 2026 +0200 KNOX-3238: upgraded dropwizard metrics to 4.2.38 (Jetty 12 needs 4.2.x) and changed to metrics-jakarta-servlets. --- gateway-server/pom.xml | 4 ++-- .../services/GatewayMetricsServletContextListener.java | 2 +- gateway-service-health/pom.xml | 2 +- .../apache/knox/gateway/service/health/MetricsResource.java | 2 +- pom.xml | 11 ++++++++--- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml index 20cc6eb80..e17173f91 100644 --- a/gateway-server/pom.xml +++ b/gateway-server/pom.xml @@ -301,7 +301,7 @@ </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-jetty9</artifactId> + <artifactId>metrics-jetty12</artifactId> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -313,7 +313,7 @@ </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-servlets</artifactId> + <artifactId>metrics-jakarta-servlets</artifactId> </dependency> <!-- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayMetricsServletContextListener.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayMetricsServletContextListener.java index 981b52b56..24d15a899 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayMetricsServletContextListener.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayMetricsServletContextListener.java @@ -18,7 +18,7 @@ package org.apache.knox.gateway.services; import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.servlets.MetricsServlet; +import io.dropwizard.metrics.servlets.MetricsServlet; import org.apache.knox.gateway.services.metrics.impl.DefaultMetricsService; public class GatewayMetricsServletContextListener extends MetricsServlet.ContextListener { diff --git a/gateway-service-health/pom.xml b/gateway-service-health/pom.xml index a4d2c2cf6..0836a2dd9 100644 --- a/gateway-service-health/pom.xml +++ b/gateway-service-health/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-servlets</artifactId> + <artifactId>metrics-jakarta-servlets</artifactId> </dependency> <dependency> <groupId>org.apache.knox</groupId> diff --git a/gateway-service-health/src/main/java/org/apache/knox/gateway/service/health/MetricsResource.java b/gateway-service-health/src/main/java/org/apache/knox/gateway/service/health/MetricsResource.java index 3762ca7ee..e04ed1abb 100644 --- a/gateway-service-health/src/main/java/org/apache/knox/gateway/service/health/MetricsResource.java +++ b/gateway-service-health/src/main/java/org/apache/knox/gateway/service/health/MetricsResource.java @@ -19,9 +19,9 @@ package org.apache.knox.gateway.service.health; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.json.MetricsModule; -import com.codahale.metrics.servlets.MetricsServlet; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; +import io.dropwizard.metrics.servlets.MetricsServlet; import org.apache.knox.gateway.i18n.messages.MessagesFactory; import jakarta.annotation.PostConstruct; diff --git a/pom.xml b/pom.xml index d94176943..36f5a799a 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version> <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version> <maven-pmd-plugin.version>3.28.0</maven-pmd-plugin.version> - <metrics.version>4.1.16</metrics.version> + <metrics.version>4.2.38</metrics.version> <mina.version>2.2.8</mina.version> <netty.version>4.1.135.Final</netty.version> <nimbus-jose-jwt.version>10.9.1</nimbus-jose-jwt.version> @@ -2536,7 +2536,7 @@ </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-servlets</artifactId> + <artifactId>metrics-jakarta-servlets</artifactId> <version>${metrics.version}</version> </dependency> <dependency> @@ -2551,7 +2551,12 @@ </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-jetty9</artifactId> + <artifactId>metrics-jetty12</artifactId> + <version>${metrics.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-jetty12-ee10</artifactId> <version>${metrics.version}</version> </dependency> <dependency>
