[openmeetings] 05/06: [OPENMEETINGS-2756] prometheus is back, code clean-up
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch jakarta-spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 13de11a3668daf0b882e9de882479168f15a4bb4 Author: Maxim Solodovnik AuthorDate: Wed Jan 18 12:32:23 2023 +0700 [OPENMEETINGS-2756] prometheus is back, code clean-up --- openmeetings-core/pom.xml | 6 -- openmeetings-util/pom.xml | 2 +- .../openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java | 4 ++-- openmeetings-web/src/main/webapp/WEB-INF/web.xml| 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index 726add729..8ff1d0ff2 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -114,12 +114,6 @@ javax.sip jain-sip-ri - - - com.sun.activation - jakarta.activation - 2.0.1 - org.junit.jupiter diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index dd5f0ea14..4c94aa663 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -133,7 +133,7 @@ io.prometheus - simpleclient_servlet + simpleclient_servlet_jakarta diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java index ed6375beb..f068ddbbc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java @@ -18,9 +18,9 @@ */ package org.apache.openmeetings.web.util.logging; -//INCOMPATIBLE with Jackarta! import io.prometheus.client.exporter.MetricsServlet; +import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet; -public class OpenMeetingsMetricsServlet /*extends MetricsServlet*/ { +public class OpenMeetingsMetricsServlet extends MetricsServlet { private static final long serialVersionUID = 1L; public OpenMeetingsMetricsServlet() { diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index 6877a51da..7dbe3091b 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -60,7 +60,7 @@
[openmeetings] 05/06: [OPENMEETINGS-2756] prometheus is back, code clean-up
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch jakarta-spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 14022bfb1faa4a6ee3d16d01d6dd17a243852772 Author: Maxim Solodovnik AuthorDate: Wed Jan 18 12:32:23 2023 +0700 [OPENMEETINGS-2756] prometheus is back, code clean-up --- openmeetings-core/pom.xml | 6 -- openmeetings-util/pom.xml | 2 +- .../openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java | 4 ++-- openmeetings-web/src/main/webapp/WEB-INF/web.xml| 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index 61eaf5882..482e63b80 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -114,12 +114,6 @@ javax.sip jain-sip-ri - - - com.sun.activation - jakarta.activation - 2.0.1 - org.junit.jupiter diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index e8261877b..65887d54f 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -133,7 +133,7 @@ io.prometheus - simpleclient_servlet + simpleclient_servlet_jakarta diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java index ed6375beb..f068ddbbc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java @@ -18,9 +18,9 @@ */ package org.apache.openmeetings.web.util.logging; -//INCOMPATIBLE with Jackarta! import io.prometheus.client.exporter.MetricsServlet; +import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet; -public class OpenMeetingsMetricsServlet /*extends MetricsServlet*/ { +public class OpenMeetingsMetricsServlet extends MetricsServlet { private static final long serialVersionUID = 1L; public OpenMeetingsMetricsServlet() { diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index 6877a51da..7dbe3091b 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -60,7 +60,7 @@
[openmeetings] 05/06: [OPENMEETINGS-2756] prometheus is back, code clean-up
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch jakarta-spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 5f66d602c51d002be575e9806a995cd4211b3c39 Author: Maxim Solodovnik AuthorDate: Wed Jan 18 12:32:23 2023 +0700 [OPENMEETINGS-2756] prometheus is back, code clean-up --- openmeetings-core/pom.xml | 6 -- openmeetings-util/pom.xml | 2 +- .../openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java | 4 ++-- openmeetings-web/src/main/webapp/WEB-INF/web.xml| 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml index 726add729..8ff1d0ff2 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -114,12 +114,6 @@ javax.sip jain-sip-ri - - - com.sun.activation - jakarta.activation - 2.0.1 - org.junit.jupiter diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml index dd5f0ea14..4c94aa663 100644 --- a/openmeetings-util/pom.xml +++ b/openmeetings-util/pom.xml @@ -133,7 +133,7 @@ io.prometheus - simpleclient_servlet + simpleclient_servlet_jakarta diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java index ed6375beb..f068ddbbc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/OpenMeetingsMetricsServlet.java @@ -18,9 +18,9 @@ */ package org.apache.openmeetings.web.util.logging; -//INCOMPATIBLE with Jackarta! import io.prometheus.client.exporter.MetricsServlet; +import io.prometheus.client.servlet.jakarta.exporter.MetricsServlet; -public class OpenMeetingsMetricsServlet /*extends MetricsServlet*/ { +public class OpenMeetingsMetricsServlet extends MetricsServlet { private static final long serialVersionUID = 1L; public OpenMeetingsMetricsServlet() { diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index 6877a51da..7dbe3091b 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -60,7 +60,7 @@