This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/spring-6 by this push:
new 9dae3029a [WICKET-7025] prometheus is back, code clean-up
9dae3029a is described below
commit 9dae3029a1bbca2adf0ad3f836da8db4b1e0e6f6
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Jan 18 12:32:23 2023 +0700
[WICKET-7025] 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 63b4639b0..6c3ceed8d 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -93,12 +93,6 @@
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
</dependency>
- <!-- FIXME TODO -->
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId> <!--
required for jakarta.mail -->
- <version>2.0.1</version>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 11f0d4473..f8581a24c 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -133,7 +133,7 @@
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
- <artifactId>simpleclient_servlet</artifactId>
+ <artifactId>simpleclient_servlet_jakarta</artifactId>
</dependency>
</dependencies>
</project>
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 @@
<!-- Start Prometheus Filter HTTP Servlet metrics
<filter>
<filter-name>prometheusFilter</filter-name>
-
<filter-class>io.prometheus.client.filter.MetricsFilter</filter-class>
+
<filter-class>io.prometheus.client.servlet.jakarta.filter.MetricsFilter</filter-class>
<init-param>
<param-name>metric-name</param-name>
<param-value>webapp_metrics_filter</param-value>
diff --git a/pom.xml b/pom.xml
index e1d259e27..72dfedbd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -599,7 +599,7 @@
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
- <artifactId>simpleclient_servlet</artifactId>
+
<artifactId>simpleclient_servlet_jakarta</artifactId>
<version>${io.prometheus.version}</version>
</dependency>
<dependency>
