Merge pull request #40028 from mattrpav

* gh-40028: Use activemq-client instead of transitional activemq-client-jakarta Closes gh-40028
spring-projects · Mar 20, 2024 · 64e4738 · 64e4738
2 parents 62f9223 + af18a69
commit 64e4738
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"
 	}