Skip to content

Commit ed3b6af

Browse files
snicollwilkinsona
authored andcommitted
Create spring-boot-artemis module
1 parent be74b56 commit ed3b6af

File tree

35 files changed

+175
-142
lines changed

35 files changed

+175
-142
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ include "spring-boot-project:spring-boot-actuator-autoconfigure"
4444
include "spring-boot-project:spring-boot-all"
4545
include "spring-boot-project:spring-boot-all-integration-tests"
4646
include "spring-boot-project:spring-boot-amqp"
47+
include "spring-boot-project:spring-boot-artemis"
4748
include "spring-boot-project:spring-boot-autoconfigure"
4849
include "spring-boot-project:spring-boot-autoconfigure-all"
4950
include "spring-boot-project:spring-boot-dependencies"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ dependencies {
1919

2020
optional(project(":spring-boot-project:spring-boot-activemq"))
2121
optional(project(":spring-boot-project:spring-boot-amqp"))
22+
optional(project(":spring-boot-project:spring-boot-artemis"))
2223
optional(project(":spring-boot-project:spring-boot-jackson"))
2324
optional(project(":spring-boot-project:spring-boot-jetty"))
2425
optional(project(":spring-boot-project:spring-boot-jsonb"))

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jms/JmsHealthContributorAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
31-
import org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration;
3231
import org.springframework.context.annotation.Bean;
3332

3433
/**
@@ -37,8 +36,8 @@
3736
* @author Stephane Nicoll
3837
* @since 2.0.0
3938
*/
40-
@AutoConfiguration(after = ArtemisAutoConfiguration.class,
41-
afterName = "org.springframework.boot.activemq.autoconfigure.ActiveMQAutoConfiguration")
39+
@AutoConfiguration(afterName = { "org.springframework.boot.activemq.autoconfigure.ActiveMQAutoConfiguration",
40+
"org.springframework.boot.artemis.autoconfigure.ArtemisAutoConfiguration" })
4241
@ConditionalOnClass(ConnectionFactory.class)
4342
@ConditionalOnBean(ConnectionFactory.class)
4443
@ConditionalOnEnabledHealthIndicator("jms")

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jms/JmsHealthContributorAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -21,8 +21,8 @@
2121
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2222
import org.springframework.boot.actuate.jms.JmsHealthIndicator;
2323
import org.springframework.boot.actuate.ldap.LdapHealthIndicator;
24+
import org.springframework.boot.artemis.autoconfigure.ArtemisAutoConfiguration;
2425
import org.springframework.boot.autoconfigure.AutoConfigurations;
25-
import org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration;
2626
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2727

2828
import static org.assertj.core.api.Assertions.assertThat;
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
plugins {
2+
id "java-library"
3+
id "org.springframework.boot.auto-configuration"
4+
id "org.springframework.boot.configuration-properties"
5+
id "org.springframework.boot.deployed"
6+
id "org.springframework.boot.optional-dependencies"
7+
}
8+
9+
description = "Spring Boot Artemis"
10+
11+
dependencies {
12+
api(project(":spring-boot-project:spring-boot-jms"))
13+
api("org.apache.activemq:artemis-jakarta-client") {
14+
exclude group: "commons-logging", module: "commons-logging"
15+
}
16+
17+
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
18+
optional("org.apache.activemq:artemis-jakarta-server") {
19+
exclude group: "commons-logging", module: "commons-logging"
20+
}
21+
optional("org.messaginghub:pooled-jms") {
22+
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
23+
}
24+
25+
testImplementation(project(":spring-boot-project:spring-boot-test"))
26+
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
27+
testImplementation("org.assertj:assertj-core")
28+
testImplementation("org.awaitility:awaitility")
29+
testImplementation("org.junit.jupiter:junit-jupiter")
30+
testImplementation("org.mockito:mockito-core")
31+
testImplementation("org.mockito:mockito-junit-jupiter")
32+
33+
testRuntimeOnly("ch.qos.logback:logback-classic")
34+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.autoconfigure.jms.artemis;
17+
package org.springframework.boot.artemis.autoconfigure;
1818

1919
import jakarta.jms.ConnectionFactory;
2020
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.autoconfigure.jms.artemis;
17+
package org.springframework.boot.artemis.autoconfigure;
1818

1919
import org.apache.activemq.artemis.core.config.Configuration;
2020
import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 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.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.autoconfigure.jms.artemis;
17+
package org.springframework.boot.artemis.autoconfigure;
1818

1919
import org.springframework.boot.autoconfigure.service.connection.ConnectionDetails;
2020

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.autoconfigure.jms.artemis;
17+
package org.springframework.boot.artemis.autoconfigure;
1818

1919
import jakarta.jms.ConnectionFactory;
2020
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.autoconfigure.jms.artemis;
17+
package org.springframework.boot.artemis.autoconfigure;
1818

1919
import java.util.function.Function;
2020

0 commit comments

Comments
 (0)