Skip to content

Commit f5156b6

Browse files
snicollwilkinsona
authored andcommitted
Create spring-boot-jms module
1 parent 22a1aea commit f5156b6

File tree

49 files changed

+258
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+258
-106
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ include "spring-boot-project:spring-boot-docker-compose"
5151
include "spring-boot-project:spring-boot-docs"
5252
include "spring-boot-project:spring-boot-jackson"
5353
include "spring-boot-project:spring-boot-jetty"
54+
include "spring-boot-project:spring-boot-jms"
5455
include "spring-boot-project:spring-boot-jsonb"
5556
include "spring-boot-project:spring-boot-mail"
5657
include "spring-boot-project:spring-boot-parent"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
optional(project(":spring-boot-project:spring-boot-amqp"))
2121
optional(project(":spring-boot-project:spring-boot-jackson"))
2222
optional(project(":spring-boot-project:spring-boot-jetty"))
23+
optional(project(":spring-boot-project:spring-boot-jms"))
2324
optional(project(":spring-boot-project:spring-boot-jsonb"))
2425
optional(project(":spring-boot-project:spring-boot-mail"))
2526
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
@@ -74,7 +75,6 @@ dependencies {
7475
optional("io.r2dbc:r2dbc-proxy")
7576
optional("io.r2dbc:r2dbc-spi")
7677
optional("io.undertow:undertow-servlet")
77-
optional("jakarta.jms:jakarta.jms-api")
7878
optional("jakarta.persistence:jakarta.persistence-api")
7979
optional("jakarta.servlet:jakarta.servlet-api")
8080
optional("javax.cache:cache-api")
@@ -116,7 +116,6 @@ dependencies {
116116
optional("org.neo4j.driver:neo4j-java-driver")
117117
optional("org.quartz-scheduler:quartz")
118118
optional("org.springframework:spring-jdbc")
119-
optional("org.springframework:spring-jms")
120119
optional("org.springframework:spring-messaging")
121120
optional("org.springframework:spring-webflux")
122121
optional("org.springframework:spring-webmvc")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies {
2424
dockerTestImplementation("org.testcontainers:testcontainers")
2525

2626
optional(project(":spring-boot-project:spring-boot-jetty"))
27+
optional(project(":spring-boot-project:spring-boot-jms"))
2728
optional(project(":spring-boot-project:spring-boot-jsonb"))
2829
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
2930
optional(project(":spring-boot-project:spring-boot-tomcat"))
@@ -49,7 +50,6 @@ dependencies {
4950
optional("io.r2dbc:r2dbc-spi")
5051
optional("io.undertow:undertow-servlet")
5152
optional("javax.cache:cache-api")
52-
optional("jakarta.jms:jakarta.jms-api")
5353
optional("org.apache.tomcat.embed:tomcat-embed-core")
5454
optional("org.aspectj:aspectjweaver")
5555
optional("org.cache2k:cache2k-micrometer")

spring-boot-project/spring-boot-all/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
optional("io.rsocket:rsocket-core")
3030
optional("io.rsocket:rsocket-transport-netty")
3131
optional("io.undertow:undertow-servlet")
32-
optional("jakarta.jms:jakarta.jms-api")
3332
optional("jakarta.persistence:jakarta.persistence-api")
3433
optional("jakarta.servlet:jakarta.servlet-api")
3534
optional("jakarta.transaction:jakarta.transaction-api")
@@ -58,15 +57,11 @@ dependencies {
5857
optional("org.liquibase:liquibase-core") {
5958
exclude(group: "javax.xml.bind", module: "jaxb-api")
6059
}
61-
optional("org.messaginghub:pooled-jms") {
62-
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"
63-
}
6460
optional("org.postgresql:postgresql")
6561
optional("org.slf4j:jul-to-slf4j")
6662
optional("org.slf4j:slf4j-api")
6763
optional("org.springframework:spring-messaging")
6864
optional("org.springframework:spring-orm")
69-
optional("org.springframework:spring-jms")
7065
optional("org.springframework:spring-oxm")
7166
optional("org.springframework:spring-r2dbc")
7267
optional("org.springframework:spring-test")

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

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

4545
optional(project(":spring-boot-project:spring-boot-jackson"))
4646
optional(project(":spring-boot-project:spring-boot-jsonb"))
47+
optional(project(":spring-boot-project:spring-boot-jms"))
4748
optional(project(":spring-boot-project:spring-boot-reactor-netty"))
4849
optional(project(":spring-boot-project:spring-boot-tomcat"))
4950
optional("co.elastic.clients:elasticsearch-java") {

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java

Lines changed: 4 additions & 4 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.
@@ -23,10 +23,10 @@
2323
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
26-
import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
27-
import org.springframework.boot.autoconfigure.jms.JmsProperties;
28-
import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration;
2926
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27+
import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration;
28+
import org.springframework.boot.jms.autoconfigure.JmsProperties;
29+
import org.springframework.boot.jms.autoconfigure.JndiConnectionFactoryAutoConfiguration;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Import;
3232

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
28-
import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryFactory;
29-
import org.springframework.boot.autoconfigure.jms.JmsProperties;
28+
import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryFactory;
29+
import org.springframework.boot.jms.autoconfigure.JmsProperties;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.jms.connection.CachingConnectionFactory;

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import java.util.ArrayList;
2121
import java.util.List;
2222

23-
import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryProperties;
2423
import org.springframework.boot.context.properties.ConfigurationProperties;
2524
import org.springframework.boot.context.properties.NestedConfigurationProperty;
25+
import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryProperties;
2626

2727
/**
2828
* Configuration properties for ActiveMQ.

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

Lines changed: 4 additions & 4 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.
@@ -23,10 +23,10 @@
2323
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
26-
import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration;
27-
import org.springframework.boot.autoconfigure.jms.JmsProperties;
28-
import org.springframework.boot.autoconfigure.jms.JndiConnectionFactoryAutoConfiguration;
2926
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27+
import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration;
28+
import org.springframework.boot.jms.autoconfigure.JmsProperties;
29+
import org.springframework.boot.jms.autoconfigure.JndiConnectionFactoryAutoConfiguration;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Import;
3232

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
28-
import org.springframework.boot.autoconfigure.jms.JmsPoolConnectionFactoryFactory;
29-
import org.springframework.boot.autoconfigure.jms.JmsProperties;
28+
import org.springframework.boot.jms.autoconfigure.JmsPoolConnectionFactoryFactory;
29+
import org.springframework.boot.jms.autoconfigure.JmsProperties;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.jms.connection.CachingConnectionFactory;

0 commit comments

Comments
 (0)