[openmeetings] 17/27: [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 60885b3c514058b5d8ad15f99304b9f825eec197
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 7ad0bbb78..c7d997381 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -113,12 +113,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 98ba695de..9989d3894 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -132,7 +132,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] 17/27: [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 8917961f8eb73a46909de0c75526559b8ce4d9e6
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 7ad0bbb78..c7d997381 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -113,12 +113,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 98ba695de..9989d3894 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -132,7 +132,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 @@
