From af18a69d544089bdbeba3b54197f92b753cb44d4 Mon Sep 17 00:00:00 2001 From: Matt Pavlovich Date: Tue, 19 Mar 2024 10:31:35 -0500 Subject: [PATCH] Use activemq-client instead of transitional activemq-client-jakarta See gh-40028 --- .../spring-boot-actuator-autoconfigure/build.gradle | 2 +- spring-boot-project/spring-boot-autoconfigure/build.gradle | 2 +- .../spring-boot-starter-activemq/build.gradle | 2 +- spring-boot-project/spring-boot-testcontainers/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index a3cf3a70fda..950740bf3ce 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -79,7 +79,7 @@ dependencies { optional("jakarta.persistence:jakarta.persistence-api") optional("jakarta.servlet:jakarta.servlet-api") optional("javax.cache:cache-api") - optional("org.apache.activemq:activemq-client-jakarta") + optional("org.apache.activemq:activemq-client") optional("org.apache.commons:commons-dbcp2") { exclude group: "commons-logging", module: "commons-logging" } diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 4cadf59a0a2..da1c1375368 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -49,7 +49,7 @@ dependencies { optional("jakarta.ws.rs:jakarta.ws.rs-api") optional("javax.cache:cache-api") optional("javax.money:money-api") - optional("org.apache.activemq:activemq-client-jakarta") + optional("org.apache.activemq:activemq-client") optional("org.apache.activemq:artemis-jakarta-client") { exclude group: "commons-logging", module: "commons-logging" } diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle index 622bef10b47..72f13cd35df 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/build.gradle @@ -7,5 +7,5 @@ description = "Starter for JMS messaging using Apache ActiveMQ" dependencies { api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter")) api("org.springframework:spring-jms") - api("org.apache.activemq:activemq-client-jakarta") + api("org.apache.activemq:activemq-client") } diff --git a/spring-boot-project/spring-boot-testcontainers/build.gradle b/spring-boot-project/spring-boot-testcontainers/build.gradle index f719fd8b5c2..e943655da3a 100644 --- a/spring-boot-project/spring-boot-testcontainers/build.gradle +++ b/spring-boot-project/spring-boot-testcontainers/build.gradle @@ -44,7 +44,7 @@ dependencies { testImplementation("io.rest-assured:rest-assured") { exclude group: "commons-logging", module: "commons-logging" } - testImplementation("org.apache.activemq:activemq-client-jakarta") + testImplementation("org.apache.activemq:activemq-client") testImplementation("org.apache.activemq:artemis-jakarta-client") { exclude group: "commons-logging", module: "commons-logging" }