Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-9333: Add jolokia 2.0.0-M4 (supporting jakarta.servlet-api)

This commit is contained in:
JB Onofré 2023-10-24 10:33:10 +02:00 committed by Jean-Baptiste Onofré
parent 5719e5df2e
commit 2945687ee5
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assembly/pom.xml
View File

@ -410,13 +410,21 @@
<artifactId>xmlParserAPIs</artifactId> <artifactId>xmlParserAPIs</artifactId>
<version>2.6.2</version> <version>2.6.2</version>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>org.jolokia</groupId> <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> <version>${jolokia-version}</version>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>com.googlecode.json-simple</groupId> <groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId> <artifactId>json-simple</artifactId>

4
assembly/src/main/descriptors/common-bin.xml
View File

@ -295,7 +295,9 @@
<include>org.jdom:jdom2</include> <include>org.jdom:jdom2</include>
<!-- REST API --> <!-- 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> <include>com.googlecode.json-simple:json-simple</include>
</includes> </includes>
<fileMode>0644</fileMode> <fileMode>0644</fileMode>

10
assembly/src/release/webapps/api/WEB-INF/web.xml
View File

@ -45,11 +45,9 @@
--> -->
</servlet> </servlet>
<!-- AMQ-9239 jakarta - jolokia does not support jakarta
<servlet> <servlet>
<servlet-name>jolokia-agent</servlet-name> <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 <!-- Uncomment this if you want jolokia multicast discovery to be enabled
<init-param> <init-param>
<param-name>discoveryEnabled</param-name> <param-name>discoveryEnabled</param-name>
@ -64,33 +62,27 @@
<param-value>Apache ActiveMQ</param-value> <param-value>Apache ActiveMQ</param-value>
</init-param> </init-param>
--> -->
<!-- AMQ-9239 jakarta - jolokia does not support jakarta
<init-param> <init-param>
<param-name>policyLocation</param-name> <param-name>policyLocation</param-name>
<param-value>${prop:jolokia.conf}</param-value> <param-value>${prop:jolokia.conf}</param-value>
</init-param> </init-param>
-->
<!-- turn off returning exceptions and stacktraces from jolokia --> <!-- turn off returning exceptions and stacktraces from jolokia -->
<!-- AMQ-9239 jakarta - jolokia does not support jakarta
<init-param> <init-param>
<param-name>allowErrorDetails</param-name> <param-name>allowErrorDetails</param-name>
<param-value>false</param-value> <param-value>false</param-value>
</init-param> </init-param>
<load-on-startup>1</load-on-startup> <load-on-startup>1</load-on-startup>
</servlet> </servlet>
-->
<servlet-mapping> <servlet-mapping>
<servlet-name>MessageServlet</servlet-name> <servlet-name>MessageServlet</servlet-name>
<url-pattern>/message/*</url-pattern> <url-pattern>/message/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- AMQ-9239 jakarta - jolokia does not support jakarta
<servlet-mapping> <servlet-mapping>
<servlet-name>jolokia-agent</servlet-name> <servlet-name>jolokia-agent</servlet-name>
<url-pattern>/jolokia/*</url-pattern> <url-pattern>/jolokia/*</url-pattern>
</servlet-mapping> </servlet-mapping>
-->
<session-config> <session-config>
<cookie-config> <cookie-config>

2
pom.xml
View File

@ -76,7 +76,7 @@
<tomcat-api-version>9.0.65</tomcat-api-version> <tomcat-api-version>9.0.65</tomcat-api-version>
<jettison-version>1.5.4</jettison-version> <jettison-version>1.5.4</jettison-version>
<jmock-version>2.12.0</jmock-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> <josql-version>1.5_5</josql-version>
<!-- for json-simple use same version as jolokia uses --> <!-- for json-simple use same version as jolokia uses -->
<json-simple-version>1.1.1</json-simple-version> <json-simple-version>1.1.1</json-simple-version>