Skip to content

Commit 3b4d5a6

Browse files
marcellorinaldomarcellorinaldo
authored
build: bump artemis from 2.6.4 to 2.33.0 (#8)
* build: bump artemis from 2.6.4 to 2.42.0 Signed-off-by: Marcello Rinaldo Martina <martina.marcello.rinaldo@outlook.com> * build: removed deps that are in kura-core Signed-off-by: Marcello Rinaldo Martina <martina.marcello.rinaldo@outlook.com> * build: replaced provided with runtime Signed-off-by: Marcello Rinaldo Martina <martina.marcello.rinaldo@outlook.com> * build: downgraded artemis to 2.33.0 Signed-off-by: Marcello Rinaldo Martina <martina.marcello.rinaldo@outlook.com> * chore: updated NOTICE file Signed-off-by: Marcello Rinaldo Martina <martina.marcello.rinaldo@outlook.com> --------- Signed-off-by: Marcello Rinaldo Martina <martina.marcello.rinaldo@outlook.com>
1 parent 35d0058 commit 3b4d5a6

10 files changed

Lines changed: 447 additions & 114 deletions

File tree

‎NOTICE.md‎

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,43 @@ This project leverages the following third party content.
3434

3535
### Maven Dependencies
3636

37-
* maven/mavencentral/org.apache.activemq/artemis-server/2.6.4, Apache-2.0, approved, CQ19068
38-
* maven/mavencentral/org.apache.activemq/artemis-commons/2.6.4, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ19066
39-
* maven/mavencentral/org.apache.activemq/artemis-core-client/2.6.4, Apache-2.0, approved, CQ19072
40-
* maven/mavencentral/org.apache.activemq/artemis-jms-client/2.6.4, Apache-2.0, approved, clearlydefined
41-
* maven/mavencentral/org.apache.activemq/artemis-jms-server/2.6.4, Apache-2.0, approved, clearlydefined
42-
* maven/mavencentral/org.apache.activemq/artemis-journal/2.6.4, Apache-2.0, approved, clearlydefined
43-
* maven/mavencentral/org.apache.activemq/artemis-selector/2.6.4, Apache-2.0, approved, clearlydefined
44-
* maven/mavencentral/org.apache.activemq/artemis-service-extensions/2.6.4, Apache-2.0, approved, clearlydefined
45-
* maven/mavencentral/org.apache.activemq/artemis-mqtt-protocol/2.6.4, Apache-2.0, approved, #3086
46-
* maven/mavencentral/org.apache.activemq/artemis-native/2.6.4, Apache-2.0, approved, CQ19010
47-
* maven/mavencentral/org.jboss.logging/jboss-logging/3.6.1.Final, Apache-2.0, approved, clearlydefined
48-
* maven/mavencentral/org.apache.geronimo.specs/geronimo-json_1.0_spec/1.0-alpha-1, Apache-2.0, approved, clearlydefined
37+
* maven/mavencentral/org.apache.activemq/artemis-server/2.33.0, Apache-2.0, approved, #14929
38+
* maven/mavencentral/org.apache.activemq/artemis-commons/2.33.0, Apache-2.0 AND (BSD-3-Clause AND MIT), approved, #14932
39+
* maven/mavencentral/org.apache.activemq/artemis-core-client/2.33.0, Apache-2.0, approved, #14918
40+
* maven/mavencentral/org.apache.activemq/artemis-journal/2.33.0, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #14979
41+
* maven/mavencentral/org.apache.activemq/artemis-selector/2.33.0, Apache-2.0, approved, #14963
42+
* maven/mavencentral/org.apache.activemq/artemis-jms-client/2.33.0, Apache-2.0, approved, #14967
43+
* maven/mavencentral/org.apache.activemq/artemis-jms-server/2.33.0, Apache-2.0, approved, #14962
44+
* maven/mavencentral/org.apache.activemq/artemis-service-extensions/2.33.0, Apache-2.0, approved, #14934
45+
* maven/mavencentral/org.apache.activemq/artemis-lockmanager-api/2.33.0, Apache-2.0, approved, clearlydefined
46+
* maven/mavencentral/jakarta.jms/jakarta.jms-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.messaging
47+
* maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jta
48+
* maven/mavencentral/jakarta.enterprise/jakarta.enterprise.cdi-api/4.1.0, Apache-2.0, approved, ee4j.cdi
49+
* maven/mavencentral/jakarta.interceptor/jakarta.interceptor-api/2.2.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.interceptors
50+
* maven/mavencentral/jakarta.el/jakarta.el-api/6.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.el
51+
* maven/mavencentral/jakarta.enterprise/jakarta.enterprise.lang-model/4.1.0, Apache-2.0, approved, ee4j.cdi
52+
* maven/mavencentral/javax.persistence/javax.persistence-api/2.2, BSD-3-Clause, approved, #280
4953
* maven/mavencentral/org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1, Apache-2.0, approved, CQ2334
50-
* maven/mavencentral/commons-beanutils/commons-beanutils/1.11.0, Apache-2.0, approved, clearlydefined
51-
* maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, CQ10385
54+
* maven/mavencentral/org.apache.commons/commons-configuration2/2.12.0, Apache-2.0, approved, clearlydefined
55+
* maven/mavencentral/io.micrometer/micrometer-core/1.15.2, Apache-2.0, approved, clearlydefined
56+
* maven/mavencentral/io.micrometer/micrometer-commons/1.15.2, Apache-2.0, approved, clearlydefined
57+
* maven/mavencentral/io.micrometer/micrometer-observation/1.15.2, Apache-2.0, approved, clearlydefined
58+
* maven/mavencentral/org.latencyutils/LatencyUtils/2.0.3, CC0-1.0, approved, #15280
59+
* maven/mavencentral/org.hdrhistogram/HdrHistogram/2.2.2, BSD-2-Clause AND CC0-1.0 AND CC0-1.0, approved, #14828
60+
* maven/mavencentral/de.dentrassi.crypto/pem-keystore/3.0.0, Apache-2.0 AND EPL-1.0, approved, clearlydefined
61+
* maven/mavencentral/com.hierynomus/asn-one/0.6.0, Apache-2.0, approved, clearlydefined
62+
* maven/mavencentral/org.jctools/jctools-core/4.0.5, Apache-2.0, approved, clearlydefined
63+
* maven/mavencentral/org.jgroups/jgroups/5.4.8.Final, Apache-2.0 AND CC-BY-2.5, approved, #22816
64+
* maven/mavencentral/com.github.ben-manes.caffeine/caffeine/3.2.2, Apache-2.0 AND (Apache-2.0 AND CC0-1.0), approved, #18889
65+
* maven/mavencentral/com.codahale.metrics/metrics-core/3.0.2, Apache-2.0, approved, clearlydefined
66+
* maven/mavencentral/com.google.errorprone/error_prone_annotations/2.41.0, Apache-2.0, approved, #22631
67+
* maven/mavencentral/org.jspecify/jspecify/1.0.0, Apache-2.0, approved, #21897
68+
* maven/mavencentral/commons-beanutils/commons-beanutils/1.11.0, Apache-2.0, approved, #21555
69+
* maven/mavencentral/commons-collections/commons-collections/3.2.2, Apache-2.0, approved, #15185
70+
* maven/mavencentral/org.apache.commons/commons-text/1.13.0, Apache-2.0, approved, #17931
71+
* maven/mavencentral/commons-logging/commons-logging/1.3.5, Apache-2.0, approved, #11783
72+
* maven/mavencentral/org.apache.activemq/activemq-artemis-native/2.0.0, Apache-2.0 AND (Apache-2.0 AND EPL-1.0 AND MIT), approved, #6739
73+
* maven/mavencentral/org.apache.activemq/artemis-mqtt-protocol/2.42.0, Apache-2.0, approved, #22817
5274

5375
## Cryptography
5476

‎bundles/org.apache.activemq.artemis/pom.xml‎

Lines changed: 134 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<description>ActiveMQ Artemis dependencies for Eclipse Kura</description>
3333

3434
<dependencies>
35+
<!-- START artemis deps -->
3536
<dependency>
3637
<groupId>org.apache.activemq</groupId>
3738
<artifactId>artemis-server</artifactId>
@@ -46,24 +47,121 @@
4647
</dependency>
4748
<dependency>
4849
<groupId>org.apache.activemq</groupId>
49-
<artifactId>artemis-jms-client</artifactId>
50+
<artifactId>artemis-journal</artifactId>
5051
</dependency>
5152
<dependency>
5253
<groupId>org.apache.activemq</groupId>
53-
<artifactId>artemis-jms-server</artifactId>
54+
<artifactId>artemis-selector</artifactId>
5455
</dependency>
5556
<dependency>
5657
<groupId>org.apache.activemq</groupId>
57-
<artifactId>artemis-journal</artifactId>
58+
<artifactId>artemis-jms-client</artifactId>
5859
</dependency>
5960
<dependency>
6061
<groupId>org.apache.activemq</groupId>
61-
<artifactId>artemis-selector</artifactId>
62+
<artifactId>artemis-jms-server</artifactId>
6263
</dependency>
6364
<dependency>
6465
<groupId>org.apache.activemq</groupId>
6566
<artifactId>artemis-service-extensions</artifactId>
6667
</dependency>
68+
<dependency>
69+
<groupId>org.apache.activemq</groupId>
70+
<artifactId>artemis-lockmanager-api</artifactId>
71+
</dependency>
72+
<!-- END artemis deps -->
73+
<!-- START jakarta deps -->
74+
<dependency>
75+
<groupId>jakarta.jms</groupId>
76+
<artifactId>jakarta.jms-api</artifactId>
77+
</dependency>
78+
<dependency>
79+
<groupId>jakarta.transaction</groupId>
80+
<artifactId>jakarta.transaction-api</artifactId>
81+
</dependency>
82+
<dependency>
83+
<groupId>jakarta.enterprise</groupId>
84+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
85+
</dependency>
86+
<dependency>
87+
<groupId>jakarta.interceptor</groupId>
88+
<artifactId>jakarta.interceptor-api</artifactId>
89+
</dependency>
90+
<dependency>
91+
<groupId>jakarta.el</groupId>
92+
<artifactId>jakarta.el-api</artifactId>
93+
</dependency>
94+
<dependency>
95+
<groupId>jakarta.enterprise</groupId>
96+
<artifactId>jakarta.enterprise.lang-model</artifactId>
97+
</dependency>
98+
<dependency>
99+
<groupId>javax.persistence</groupId>
100+
<artifactId>javax.persistence-api</artifactId>
101+
</dependency>
102+
<!-- END jakarta deps -->
103+
<!-- START transitive deps -->
104+
<dependency>
105+
<groupId>org.apache.geronimo.specs</groupId>
106+
<artifactId>geronimo-jta_1.1_spec</artifactId>
107+
</dependency>
108+
<dependency>
109+
<groupId>org.apache.commons</groupId>
110+
<artifactId>commons-configuration2</artifactId>
111+
</dependency>
112+
<dependency>
113+
<groupId>io.micrometer</groupId>
114+
<artifactId>micrometer-core</artifactId>
115+
</dependency>
116+
<dependency>
117+
<groupId>io.micrometer</groupId>
118+
<artifactId>micrometer-commons</artifactId>
119+
</dependency>
120+
<dependency>
121+
<groupId>io.micrometer</groupId>
122+
<artifactId>micrometer-observation</artifactId>
123+
</dependency>
124+
<dependency>
125+
<groupId>org.latencyutils</groupId>
126+
<artifactId>LatencyUtils</artifactId>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.hdrhistogram</groupId>
130+
<artifactId>HdrHistogram</artifactId>
131+
</dependency>
132+
<dependency>
133+
<groupId>de.dentrassi.crypto</groupId>
134+
<artifactId>pem-keystore</artifactId>
135+
</dependency>
136+
<dependency>
137+
<groupId>com.hierynomus</groupId>
138+
<artifactId>asn-one</artifactId>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.jctools</groupId>
142+
<artifactId>jctools-core</artifactId>
143+
</dependency>
144+
<dependency>
145+
<groupId>org.jgroups</groupId>
146+
<artifactId>jgroups</artifactId>
147+
</dependency>
148+
<dependency>
149+
<groupId>com.github.ben-manes.caffeine</groupId>
150+
<artifactId>caffeine</artifactId>
151+
</dependency>
152+
<dependency>
153+
<groupId>com.codahale.metrics</groupId>
154+
<artifactId>metrics-core</artifactId>
155+
</dependency>
156+
<dependency>
157+
<groupId>com.google.errorprone</groupId>
158+
<artifactId>error_prone_annotations</artifactId>
159+
</dependency>
160+
<dependency>
161+
<groupId>org.jspecify</groupId>
162+
<artifactId>jspecify</artifactId>
163+
</dependency>
164+
<!-- END transitive deps -->
67165
</dependencies>
68166

69167
<build>
@@ -76,13 +174,41 @@
76174
<configuration>
77175
<instructions>
78176
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
79-
<Embed-Dependency>*</Embed-Dependency>
177+
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
80178
<Import-Package>
81179
org.apache.activemq.artemis.jdbc.store.*;version="${org.apache.activemq.artemis.upstream.version}";resolution:=optional,
82180
org.apache.xpath.*;resolution:=optional,
83-
org.jboss.logmanager;resolution:=optional,
84-
org.jboss.logmanager.*;resolution:=optional,
85-
org.jgroups.*;resolution:=optional,
181+
org.apache.commons.text,
182+
org.apache.commons.lang3,
183+
<!-- START micrometer-core optional dependencies -->
184+
!ch.qos.logback.*,
185+
!com.mongodb.*,
186+
!com.netflix.hystrix.*,
187+
!io.grpc.*,
188+
!kotlin.*,
189+
!kotlinx.coroutines.*,
190+
!io.micrometer.context.*,
191+
!javax.cache.*,
192+
!net.sf.ehcache.*,
193+
!okhttp3.*,
194+
!org.apache.catalina.*,
195+
!org.apache.hc.client5.http.*,
196+
!org.apache.hc.core5.concurrent.*,
197+
!org.apache.hc.core5.http.*,
198+
!org.apache.hc.core5.pool.*,
199+
!org.apache.hc.core5.util.*,
200+
!org.apache.http.*,
201+
!org.apache.kafka.*,
202+
!org.aspectj.*,
203+
!org.bson.*,
204+
!org.eclipse.jetty.client.api.*,
205+
!org.eclipse.jetty.server.api.*,
206+
!org.glassfish.json.*,
207+
!org.hibernate.*,
208+
!org.jooq.*,
209+
!rx.*,
210+
javax.xml.bind.*;resolution:=optional,
211+
<!-- END micrometer-core optional dependencies -->
86212
*
87213
</Import-Package>
88214
<Export-Package>

‎bundles/org.eclipse.kura.broker.artemis.core/META-INF/MANIFEST.MF‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Bundle-Vendor: Eclipse Kura
77
Bundle-License: Eclipse Public License v2.0
88
Bundle-ActivationPolicy: lazy
99
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=17))"
10-
Import-Package: org.apache.activemq.artemis.core.config;version="2.6.0",
11-
org.apache.activemq.artemis.core.config.impl;version="2.6.0",
12-
org.apache.activemq.artemis.core.deployers;version="2.6.0",
13-
org.apache.activemq.artemis.core.server;version="2.6.0",
14-
org.apache.activemq.artemis.jms.server.config.impl;version="2.6.0",
15-
org.apache.activemq.artemis.spi.core.protocol;version="2.6.0",
16-
org.apache.activemq.artemis.spi.core.security;version="2.6.0",
17-
org.apache.activemq.artemis.spi.core.security.jaas;version="2.6.0",
10+
Import-Package: org.apache.activemq.artemis.core.config;version="[2.33,3.0)",
11+
org.apache.activemq.artemis.core.config.impl;version="[2.33,3.0)",
12+
org.apache.activemq.artemis.core.deployers;version="[2.33,3.0)",
13+
org.apache.activemq.artemis.core.server;version="[2.33,3.0)",
14+
org.apache.activemq.artemis.jms.server.config.impl;version="[2.33,3.0)",
15+
org.apache.activemq.artemis.spi.core.protocol;version="[2.33,3.0)",
16+
org.apache.activemq.artemis.spi.core.security;version="[2.33,3.0)",
17+
org.apache.activemq.artemis.spi.core.security.jaas;version="[2.33,3.0)",
1818
org.eclipse.kura.configuration;version="[1.1,2.0)",
1919
org.osgi.framework;version="1.8",
2020
org.osgi.util.tracker;version="1.5",

‎bundles/org.eclipse.kura.broker.artemis.core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.eclipse.kura</groupId>
4141
<artifactId>org.apache.activemq.artemis</artifactId>
42-
<scope>provided</scope>
42+
<scope>runtime</scope>
4343
</dependency>
4444
</dependencies>
4545

‎bundles/org.eclipse.kura.broker.artemis.core/src/main/java/org/eclipse/kura/broker/artemis/core/ServerRunner.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2020 Red Hat Inc and others
3-
*
2+
* Copyright (c) 2017, 2025 Red Hat Inc and others
3+
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
66
* which is available at https://www.eclipse.org/legal/epl-2.0/
7-
*
7+
*
88
* SPDX-License-Identifier: EPL-2.0
9-
*
9+
*
1010
* Contributors:
1111
* Red Hat Inc
1212
* Eurotech
@@ -30,6 +30,7 @@
3030
import org.apache.activemq.artemis.core.config.FileDeploymentManager;
3131
import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
3232
import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration;
33+
import org.apache.activemq.artemis.core.server.ActivateCallback;
3334
import org.apache.activemq.artemis.core.server.ActiveMQComponent;
3435
import org.apache.activemq.artemis.core.server.ActiveMQServer;
3536
import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
@@ -85,7 +86,9 @@ private void createArtemis(final Path brokerXmlFile) throws Exception {
8586

8687
// load components
8788

88-
this.components = fileDeploymentManager.buildService(security, ManagementFactory.getPlatformMBeanServer());
89+
this.components = fileDeploymentManager.buildService(security, ManagementFactory.getPlatformMBeanServer(),
90+
new ActivateCallback() {
91+
});
8992

9093
logger.info("Loaded components: {}", this.components.size());
9194
for (final Map.Entry<String, ActiveMQComponent> entry : this.components.entrySet()) {

‎bundles/org.eclipse.kura.broker.artemis.simple.mqtt/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.eclipse.kura</groupId>
4141
<artifactId>org.apache.activemq.artemis</artifactId>
42-
<scope>provided</scope>
42+
<scope>runtime</scope>
4343
</dependency>
4444
</dependencies>
4545

‎bundles/org.eclipse.kura.broker.artemis.xml/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>org.eclipse.kura</groupId>
4141
<artifactId>org.apache.activemq.artemis</artifactId>
42-
<scope>provided</scope>
42+
<scope>runtime</scope>
4343
</dependency>
4444
</dependencies>
4545

‎distrib/pom.xml‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,28 @@
3131

3232
<dependencies>
3333
<dependency>
34-
<groupId>org.apache.activemq</groupId>
35-
<artifactId>artemis-mqtt-protocol</artifactId>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.apache.activemq</groupId>
39-
<artifactId>artemis-native</artifactId>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.jboss.logging</groupId>
43-
<artifactId>jboss-logging</artifactId>
34+
<groupId>commons-beanutils</groupId>
35+
<artifactId>commons-beanutils</artifactId>
4436
</dependency>
4537
<dependency>
46-
<groupId>org.apache.geronimo.specs</groupId>
47-
<artifactId>geronimo-json_1.0_spec</artifactId>
38+
<groupId>commons-collections</groupId>
39+
<artifactId>commons-collections</artifactId>
4840
</dependency>
4941
<dependency>
50-
<groupId>org.apache.geronimo.specs</groupId>
51-
<artifactId>geronimo-jta_1.1_spec</artifactId>
42+
<groupId>org.apache.commons</groupId>
43+
<artifactId>commons-text</artifactId>
5244
</dependency>
5345
<dependency>
54-
<groupId>commons-beanutils</groupId>
55-
<artifactId>commons-beanutils</artifactId>
46+
<groupId>commons-logging</groupId>
47+
<artifactId>commons-logging</artifactId>
5648
</dependency>
5749
<dependency>
58-
<groupId>commons-collections</groupId>
59-
<artifactId>commons-collections</artifactId>
50+
<groupId>org.apache.activemq</groupId>
51+
<artifactId>activemq-artemis-native</artifactId>
6052
</dependency>
61-
<!-- External deps in common with Camel, available in kura-target-platform -->
6253
<dependency>
63-
<groupId>org.apache.geronimo.specs</groupId>
64-
<artifactId>geronimo-jms_2.0_spec</artifactId>
65-
<scope>provided</scope>
54+
<groupId>org.apache.activemq</groupId>
55+
<artifactId>artemis-mqtt-protocol</artifactId>
6656
</dependency>
6757
<!-- This project's bundles -->
6858
<dependency>
@@ -228,12 +218,11 @@
228218
</goals>
229219
<configuration>
230220
<includeArtifactIds>
231-
artemis-native,
232-
jboss-logging,
233-
geronimo-json_1.0_spec,
234-
geronimo-jta_1.1_spec,
221+
activemq-artemis-native,
235222
commons-beanutils,
236223
commons-collections,
224+
commons-text,
225+
commons-logging,
237226
org.apache.activemq.artemis
238227
</includeArtifactIds>
239228
<excludeTransitive>true</excludeTransitive>
@@ -251,6 +240,7 @@
251240
<includeArtifactIds>
252241
artemis-mqtt-protocol
253242
</includeArtifactIds>
243+
<excludeTransitive>true</excludeTransitive>
254244
<stripVersion>false</stripVersion>
255245
<outputDirectory>${project.build.directory}/plugins_3s</outputDirectory>
256246
</configuration>

0 commit comments

Comments
 (0)