Skip to content

Commit 14e2c1a

Browse files
gemmellrclebertsuconic
authored andcommitted
ARTEMIS-5872: update to artemis-console 1.6.0
Removes the now-duplicate 5e05931 config to disable detectors, its part of the console release now. Keeps test to verify behaviour. Reverts commit f29a58e as the workaround isnt needed, console now uses jolokia 2.4.3 with fix.
1 parent cf68c5a commit 14e2c1a

File tree

4 files changed

+1
-67
lines changed

4 files changed

+1
-67
lines changed

artemis-console/pom.xml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,30 +57,6 @@
5757
</exclusion>
5858
</exclusions>
5959
</dependency>
60-
<dependency>
61-
<groupId>org.jolokia</groupId>
62-
<artifactId>jolokia-json</artifactId>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.jolokia</groupId>
66-
<artifactId>jolokia-server-core</artifactId>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.jolokia</groupId>
70-
<artifactId>jolokia-server-detector</artifactId>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.jolokia</groupId>
74-
<artifactId>jolokia-service-jmx</artifactId>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.jolokia</groupId>
78-
<artifactId>jolokia-service-jsr160</artifactId>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.jolokia</groupId>
82-
<artifactId>jolokia-service-serializer</artifactId>
83-
</dependency>
8460
</dependencies>
8561

8662
<build>
@@ -118,12 +94,6 @@
11894
<exclude>WEB-INF/lib/error_prone_annotations-*.jar</exclude>
11995
<exclude>WEB-INF/lib/j2objc-annotations-*.jar</exclude>
12096
<exclude>WEB-INF/classes/log4j2.properties</exclude>
121-
<exclude>WEB-INF/lib/jolokia-json-*.jar</exclude>
122-
<exclude>WEB-INF/lib/jolokia-server-core-*.jar</exclude>
123-
<exclude>WEB-INF/lib/jolokia-server-detector-*.jar</exclude>
124-
<exclude>WEB-INF/lib/jolokia-service-jmx-*.jar</exclude>
125-
<exclude>WEB-INF/lib/jolokia-service-jsr160-*.jar</exclude>
126-
<exclude>WEB-INF/lib/jolokia-service-serializer-*.jar</exclude>
12797
</excludes>
12898
</overlay>
12999
</overlays>

artemis-console/src/main/resources/META-INF/jolokia/detectors

Lines changed: 0 additions & 26 deletions
This file was deleted.

artemis-pom/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -943,14 +943,6 @@
943943
<type>pom</type>
944944
<scope>import</scope>
945945
</dependency>
946-
947-
<dependency>
948-
<groupId>org.jolokia</groupId>
949-
<artifactId>jolokia-bom</artifactId>
950-
<version>${jolokia.version}</version>
951-
<type>pom</type>
952-
<scope>import</scope>
953-
</dependency>
954946
</dependencies>
955947
</dependencyManagement>
956948

pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<modular.jdk.surefire.arg>--add-modules java.sql,jdk.unsupported </modular.jdk.surefire.arg>
9191

9292
<activemq-artemis-native-version>2.0.0</activemq-artemis-native-version>
93-
<artemis-console-version>1.5.0</artemis-console-version>
93+
<artemis-console-version>1.6.0</artemis-console-version>
9494
<karaf.version>4.4.8</karaf.version>
9595
<pax.exam.version>4.14.0</pax.exam.version>
9696
<commons.config.version>2.13.0</commons.config.version>
@@ -204,8 +204,6 @@
204204

205205
<jackson.version>2.21.0</jackson.version>
206206

207-
<jolokia.version>2.4.3</jolokia.version>
208-
209207
<activemq.version.versionName>${project.version}</activemq.version.versionName>
210208
<activemq.version.majorVersion>1</activemq.version.majorVersion>
211209
<activemq.version.minorVersion>0</activemq.version.minorVersion>

0 commit comments

Comments
 (0)