Skip to content

Commit 894f83f

Browse files
wilkinsonawilkinsona
committed
Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API
Closes spring-projectsgh-29203
1 parent 89e79e8 commit 894f83f

File tree

12 files changed

+25
-139
lines changed

12 files changed

+25
-139
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+2-7
Original file line numberDiff line numberDiff line change
@@ -145,16 +145,11 @@ dependencies {
145145
exclude group: "org.jboss.spec.javax.annotation", module: "jboss-annotations-api_1.3_spec"
146146
}
147147
testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
148-
testImplementation("org.apache.activemq:artemis-jms-client") {
148+
testImplementation("org.apache.activemq:artemis-jakarta-client") {
149149
exclude group: "commons-logging", module: "commons-logging"
150-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
151-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
152150
}
153-
testImplementation("org.apache.activemq:artemis-jms-server") {
151+
testImplementation("org.apache.activemq:artemis-jakarta-server") {
154152
exclude group: "commons-logging", module: "commons-logging"
155-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
156-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
157-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jta_1.1_spec"
158153
}
159154
testImplementation("org.apache.logging.log4j:log4j-to-slf4j")
160155
testImplementation("org.aspectj:aspectjrt")

‎spring-boot-project/spring-boot-autoconfigure/build.gradle

+2-7
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,11 @@ dependencies {
4848
optional("jakarta.ws.rs:jakarta.ws.rs-api")
4949
optional("javax.cache:cache-api")
5050
optional("javax.money:money-api")
51-
optional("org.apache.activemq:artemis-jms-client") {
51+
optional("org.apache.activemq:artemis-jakarta-client") {
5252
exclude group: "commons-logging", module: "commons-logging"
53-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
54-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
5553
}
56-
optional("org.apache.activemq:artemis-jms-server") {
54+
optional("org.apache.activemq:artemis-jakarta-server") {
5755
exclude group: "commons-logging", module: "commons-logging"
58-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
59-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
60-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jta_1.1_spec"
6156
}
6257
optional("org.apache.commons:commons-dbcp2") {
6358
exclude group: "commons-logging", module: "commons-logging"

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.autoconfigure.jms.artemis;
1818

19-
import javax.jms.ConnectionFactory;
19+
import jakarta.jms.ConnectionFactory;
2020

2121
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
2222

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java

+2-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,17 +16,14 @@
1616

1717
package org.springframework.boot.autoconfigure.jms.artemis;
1818

19-
import javax.jms.ConnectionFactory;
19+
import jakarta.jms.ConnectionFactory;
2020

2121
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
22-
import org.apache.commons.pool2.PooledObject;
23-
import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
2422

2523
import org.springframework.beans.factory.ListableBeanFactory;
2624
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2725
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2826
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
29-
import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryFactory;
3027
import org.springframework.boot.autoconfigure.jms.JmsProperties;
3128
import org.springframework.context.annotation.Bean;
3229
import org.springframework.context.annotation.Configuration;
@@ -83,19 +80,4 @@ private ActiveMQConnectionFactory createConnectionFactory() {
8380

8481
}
8582

86-
@Configuration(proxyBeanMethods = false)
87-
@ConditionalOnClass({ JmsPoolConnectionFactory.class, PooledObject.class })
88-
@ConditionalOnProperty(prefix = "spring.artemis.pool", name = "enabled", havingValue = "true")
89-
static class PooledConnectionFactoryConfiguration {
90-
91-
@Bean(destroyMethod = "stop")
92-
JmsPoolConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties) {
93-
ActiveMQConnectionFactory connectionFactory = new ArtemisConnectionFactoryFactory(beanFactory, properties)
94-
.createConnectionFactory(ActiveMQConnectionFactory.class);
95-
return new JmsPoolConnectionFactoryFactory(properties.getPool())
96-
.createPooledConnectionFactory(connectionFactory);
97-
}
98-
99-
}
100-
10183
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,10 +23,8 @@
2323

2424
import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
2525

26-
import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryProperties;
2726
import org.springframework.boot.context.properties.ConfigurationProperties;
2827
import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
29-
import org.springframework.boot.context.properties.NestedConfigurationProperty;
3028

3129
/**
3230
* Configuration properties for Artemis.
@@ -71,9 +69,6 @@ public class ArtemisProperties {
7169

7270
private final Embedded embedded = new Embedded();
7371

74-
@NestedConfigurationProperty
75-
private final JmsPoolConnectionFactoryProperties pool = new JmsPoolConnectionFactoryProperties();
76-
7772
public ArtemisMode getMode() {
7873
return this.mode;
7974
}
@@ -142,10 +137,6 @@ public Embedded getEmbedded() {
142137
return this.embedded;
143138
}
144139

145-
public JmsPoolConnectionFactoryProperties getPool() {
146-
return this.pool;
147-
}
148-
149140
/**
150141
* Configuration for an embedded Artemis server.
151142
*/

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2019 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
1616

1717
package org.springframework.boot.autoconfigure.jms.artemis;
1818

19-
import javax.jms.ConnectionFactory;
20-
import javax.transaction.TransactionManager;
19+
import jakarta.jms.ConnectionFactory;
20+
import jakarta.transaction.TransactionManager;
2121

2222
import org.apache.activemq.artemis.jms.client.ActiveMQXAConnectionFactory;
2323

‎spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java

+4-57
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
2222
import java.nio.file.Path;
2323
import java.util.UUID;
2424

25-
import javax.jms.ConnectionFactory;
26-
import javax.jms.Message;
27-
import javax.jms.TextMessage;
25+
import jakarta.jms.ConnectionFactory;
26+
import jakarta.jms.Message;
27+
import jakarta.jms.TextMessage;
2828

2929
import org.apache.activemq.artemis.api.core.RoutingType;
3030
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -43,7 +43,6 @@
4343
import org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
4444
import org.junit.jupiter.api.Test;
4545
import org.junit.jupiter.api.io.TempDir;
46-
import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
4746

4847
import org.springframework.boot.autoconfigure.AutoConfigurations;
4948
import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
@@ -321,58 +320,6 @@ void connectToASpecificEmbeddedBroker() {
321320
});
322321
}
323322

324-
@Test
325-
void defaultPoolConnectionFactoryIsApplied() {
326-
this.contextRunner.withPropertyValues("spring.artemis.pool.enabled=true").run((context) -> {
327-
assertThat(context.getBeansOfType(JmsPoolConnectionFactory.class)).hasSize(1);
328-
JmsPoolConnectionFactory connectionFactory = context.getBean(JmsPoolConnectionFactory.class);
329-
JmsPoolConnectionFactory defaultFactory = new JmsPoolConnectionFactory();
330-
assertThat(connectionFactory.isBlockIfSessionPoolIsFull())
331-
.isEqualTo(defaultFactory.isBlockIfSessionPoolIsFull());
332-
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout())
333-
.isEqualTo(defaultFactory.getBlockIfSessionPoolIsFullTimeout());
334-
assertThat(connectionFactory.getConnectionIdleTimeout())
335-
.isEqualTo(defaultFactory.getConnectionIdleTimeout());
336-
assertThat(connectionFactory.getMaxConnections()).isEqualTo(defaultFactory.getMaxConnections());
337-
assertThat(connectionFactory.getMaxSessionsPerConnection())
338-
.isEqualTo(defaultFactory.getMaxSessionsPerConnection());
339-
assertThat(connectionFactory.getConnectionCheckInterval())
340-
.isEqualTo(defaultFactory.getConnectionCheckInterval());
341-
assertThat(connectionFactory.isUseAnonymousProducers()).isEqualTo(defaultFactory.isUseAnonymousProducers());
342-
});
343-
}
344-
345-
@Test
346-
void customPoolConnectionFactoryIsApplied() {
347-
this.contextRunner
348-
.withPropertyValues("spring.artemis.pool.enabled=true", "spring.artemis.pool.blockIfFull=false",
349-
"spring.artemis.pool.blockIfFullTimeout=64", "spring.artemis.pool.idleTimeout=512",
350-
"spring.artemis.pool.maxConnections=256", "spring.artemis.pool.maxSessionsPerConnection=1024",
351-
"spring.artemis.pool.timeBetweenExpirationCheck=2048",
352-
"spring.artemis.pool.useAnonymousProducers=false")
353-
.run((context) -> {
354-
assertThat(context.getBeansOfType(JmsPoolConnectionFactory.class)).hasSize(1);
355-
JmsPoolConnectionFactory connectionFactory = context.getBean(JmsPoolConnectionFactory.class);
356-
assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isFalse();
357-
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64);
358-
assertThat(connectionFactory.getConnectionIdleTimeout()).isEqualTo(512);
359-
assertThat(connectionFactory.getMaxConnections()).isEqualTo(256);
360-
assertThat(connectionFactory.getMaxSessionsPerConnection()).isEqualTo(1024);
361-
assertThat(connectionFactory.getConnectionCheckInterval()).isEqualTo(2048);
362-
assertThat(connectionFactory.isUseAnonymousProducers()).isFalse();
363-
});
364-
}
365-
366-
@Test
367-
void poolConnectionFactoryConfiguration() {
368-
this.contextRunner.withPropertyValues("spring.artemis.pool.enabled:true").run((context) -> {
369-
ConnectionFactory factory = getConnectionFactory(context);
370-
assertThat(factory).isInstanceOf(JmsPoolConnectionFactory.class);
371-
context.getSourceApplicationContext().close();
372-
assertThat(factory.createConnection()).isNull();
373-
});
374-
}
375-
376323
private ConnectionFactory getConnectionFactory(AssertableApplicationContext context) {
377324
assertThat(context).hasSingleBean(ConnectionFactory.class).hasBean("jmsConnectionFactory");
378325
ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class);

‎spring-boot-project/spring-boot-cli/samples/jms.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.test
22

33
@Grab("spring-boot-starter-artemis")
4-
@Grab("artemis-jms-server")
4+
@Grab("artemis-jakarta-server")
55
import java.util.concurrent.CountDownLatch
66

77
@Log

‎spring-boot-project/spring-boot-cli/test-samples/jms.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@Grab("spring-boot-starter-artemis")
2-
@Grab("artemis-jms-server")
2+
@Grab("artemis-jakarta-server")
33
import java.util.concurrent.CountDownLatch
44

55
@Log

‎spring-boot-project/spring-boot-dependencies/build.gradle

+6-17
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,17 @@ bom {
3131
]
3232
}
3333
}
34-
library("Artemis", "2.19.0") {
34+
library("Artemis", "2.20.0") {
3535
group("org.apache.activemq") {
3636
modules = [
3737
"artemis-amqp-protocol",
38-
"artemis-commons" {
39-
exclude group: "commons-logging", module: "commons-logging"
40-
},
41-
"artemis-core-client" {
42-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
43-
},
44-
"artemis-jms-client" {
45-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
46-
},
47-
"artemis-jms-server" {
48-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
49-
},
38+
"artemis-commons",
39+
"artemis-core-client",
40+
"artemis-jakarta-client",
41+
"artemis-jakarta-server",
5042
"artemis-journal",
5143
"artemis-selector",
52-
"artemis-server" {
53-
exclude group: "commons-logging", module: "commons-logging"
54-
exclude group: "org.apache.geronimo.specs", module: "geronimo-json_1.0_spec"
55-
},
44+
"artemis-server",
5645
"artemis-service-extensions"
5746
]
5847
}

‎spring-boot-project/spring-boot-docs/src/docs/asciidoc/messaging/jms.adoc

-13
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,6 @@ By default, a `CachingConnectionFactory` wraps the native `ConnectionFactory` wi
4343
session-cache-size: 5
4444
----
4545

46-
If you'd rather use native pooling, you can do so by adding a dependency to `org.messaginghub:pooled-jms` and configuring the `JmsPoolConnectionFactory` accordingly, as shown in the following example:
47-
48-
[source,yaml,indent=0,subs="verbatim",configprops,configblocks]
49-
----
50-
spring:
51-
artemis:
52-
pool:
53-
enabled: true
54-
max-connections: 50
55-
----
56-
57-
See {spring-boot-autoconfigure-module-code}/jms/artemis/ArtemisProperties.java[`ArtemisProperties`] for more supported options.
58-
5946
No JNDI lookup is involved, and destinations are resolved against their names, using either the `name` attribute in the Artemis configuration or the names provided through configuration.
6047

6148

‎spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "Starter for JMS messaging using Apache Artemis"
77
dependencies {
88
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
99
api("org.springframework:spring-jms")
10-
api("org.apache.activemq:artemis-jms-client") {
10+
api("org.apache.activemq:artemis-jakarta-client") {
1111
exclude group: "commons-logging", module: "commons-logging"
1212
}
1313
}

0 commit comments

Comments
 (0)