This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 2945687ee AMQ-9333: Add jolokia 2.0.0-M4 (supporting
jakarta.servlet-api)
new 54cddfc26 Merge pull request #1097 from jbonofre/AMQ-9333
2945687ee is described below
commit 2945687ee5317baac768c86b7f6f81e711518bc5
Author: JB Onofré <[email protected]>
AuthorDate: Tue Oct 24 10:33:10 2023 +0200
AMQ-9333: Add jolokia 2.0.0-M4 (supporting jakarta.servlet-api)
---
assembly/pom.xml | 14 +++++++++++---
assembly/src/main/descriptors/common-bin.xml | 4 +++-
assembly/src/release/webapps/api/WEB-INF/web.xml | 10 +---------
pom.xml | 2 +-
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index e746f6a5e..5e3bb4a2e 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -410,13 +410,21 @@
<artifactId>xmlParserAPIs</artifactId>
<version>2.6.2</version>
</dependency>
- <!--
<dependency>
<groupId>org.jolokia</groupId>
- <artifactId>jolokia-core</artifactId>
+ <artifactId>jolokia-server-core</artifactId>
+ <version>${jolokia-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jolokia</groupId>
+ <artifactId>jolokia-service-jmx</artifactId>
+ <version>${jolokia-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jolokia</groupId>
+ <artifactId>jolokia-service-serializer</artifactId>
<version>${jolokia-version}</version>
</dependency>
- -->
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
diff --git a/assembly/src/main/descriptors/common-bin.xml
b/assembly/src/main/descriptors/common-bin.xml
index 013a0e8f9..7561c6ff1 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -295,7 +295,9 @@
<include>org.jdom:jdom2</include>
<!-- REST API -->
- <!-- include>org.jolokia:jolokia-core</include -->
+ <include>org.jolokia:jolokia-server-core</include>
+ <include>org.jolokia:jolokia-service-jmx</include>
+ <include>org.jolokia:jolokia-service-serializer</include>
<include>com.googlecode.json-simple:json-simple</include>
</includes>
<fileMode>0644</fileMode>
diff --git a/assembly/src/release/webapps/api/WEB-INF/web.xml
b/assembly/src/release/webapps/api/WEB-INF/web.xml
index b8508a15c..2a1a01036 100644
--- a/assembly/src/release/webapps/api/WEB-INF/web.xml
+++ b/assembly/src/release/webapps/api/WEB-INF/web.xml
@@ -45,11 +45,9 @@
-->
</servlet>
- <!-- AMQ-9239 jakarta - jolokia does not support jakarta
<servlet>
<servlet-name>jolokia-agent</servlet-name>
- <servlet-class>org.jolokia.http.AgentServlet</servlet-class>
- -->
+
<servlet-class>org.jolokia.server.core.http.AgentServlet</servlet-class>
<!-- Uncomment this if you want jolokia multicast discovery to be
enabled
<init-param>
<param-name>discoveryEnabled</param-name>
@@ -64,33 +62,27 @@
<param-value>Apache ActiveMQ</param-value>
</init-param>
-->
- <!-- AMQ-9239 jakarta - jolokia does not support jakarta
<init-param>
<param-name>policyLocation</param-name>
<param-value>${prop:jolokia.conf}</param-value>
</init-param>
- -->
<!-- turn off returning exceptions and stacktraces from jolokia -->
- <!-- AMQ-9239 jakarta - jolokia does not support jakarta
<init-param>
<param-name>allowErrorDetails</param-name>
<param-value>false</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
- -->
<servlet-mapping>
<servlet-name>MessageServlet</servlet-name>
<url-pattern>/message/*</url-pattern>
</servlet-mapping>
- <!-- AMQ-9239 jakarta - jolokia does not support jakarta
<servlet-mapping>
<servlet-name>jolokia-agent</servlet-name>
<url-pattern>/jolokia/*</url-pattern>
</servlet-mapping>
- -->
<session-config>
<cookie-config>
diff --git a/pom.xml b/pom.xml
index fc868cd49..cd309c6a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<tomcat-api-version>9.0.65</tomcat-api-version>
<jettison-version>1.5.4</jettison-version>
<jmock-version>2.12.0</jmock-version>
- <jolokia-version>1.7.1</jolokia-version>
+ <jolokia-version>2.0.0-M4</jolokia-version>
<josql-version>1.5_5</josql-version>
<!-- for json-simple use same version as jolokia uses -->
<json-simple-version>1.1.1</json-simple-version>
