Add ActiveMQ Classic support for Docker Compose and Testcontainers

start-site/src/main/java/io/spring/start/site/container/SimpleDockerServiceResolver.java

@@ -35,6 +35,7 @@ public class SimpleDockerServiceResolver implements DockerServiceResolver {
 	public SimpleDockerServiceResolver() {
 		this.dockerServices = new HashMap<>();
 		this.dockerServices.put("activeMQ", activeMQ());
+		this.dockerServices.put("activeMQClassic", activeMQClassic());
 		this.dockerServices.put("artemis", artemis());
 		this.dockerServices.put("cassandra", cassandra());
 		this.dockerServices.put("elasticsearch", elasticsearch());
@@ -59,6 +60,13 @@ private static DockerService activeMQ() {
 			.build();
 	}
 
+	private static DockerService activeMQClassic() {
+		return DockerService.withImageAndTag("apache/activemq-classic")
+			.website("https://hub.docker.com/r/apache/activemq-classic")
+			.ports(61616)
+			.build();
+	}
+
 	private static DockerService artemis() {
 		return DockerService.withImageAndTag("apache/activemq-artemis")
 			.website("https://hub.docker.com/r/apache/activemq-classic")

start-site/src/main/java/io/spring/start/site/extension/dependency/activemq/ActiveMQProjectGenerationConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,10 @@
 @ConditionalOnRequestedDependency("activemq")
 public class ActiveMQProjectGenerationConfiguration {
 
+	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.activemq.ActiveMQContainer";
+
 	@Bean
-	@ConditionalOnPlatformVersion("3.2.0-M1")
+	@ConditionalOnPlatformVersion("[3.2.0-M1,3.3.0-M2)")
 	@ConditionalOnRequestedDependency("testcontainers")
 	ServiceConnectionsCustomizer activeMQServiceConnectionsCustomizer(DockerServiceResolver serviceResolver) {
 		return (serviceConnections) -> serviceResolver.doWith("activeMQ", (service) -> serviceConnections
@@ -45,10 +47,26 @@ ServiceConnectionsCustomizer activeMQServiceConnectionsCustomizer(DockerServiceR
 
 	@Bean
 	@ConditionalOnPlatformVersion("3.2.0-M1")
+	@ConditionalOnRequestedDependency("testcontainers")
+	ServiceConnectionsCustomizer activeMQClassicServiceConnectionsCustomizer(DockerServiceResolver serviceResolver) {
+		return (serviceConnections) -> serviceResolver.doWith("activeMQClassic", (service) -> serviceConnections
+			.addServiceConnection(ServiceConnection.ofContainer("activemq", service, TESTCONTAINERS_CLASS_NAME)));
+	}
+
+	@Bean
+	@ConditionalOnPlatformVersion("[3.2.0-M1,3.3.0-M2)")
 	@ConditionalOnRequestedDependency("docker-compose")
 	ComposeFileCustomizer activeMQComposeFileCustomizer(DockerServiceResolver serviceResolver) {
 		return (composeFile) -> serviceResolver.doWith("activeMQ",
 				(service) -> composeFile.services().add("activemq", service));
 	}
 
+	@Bean
+	@ConditionalOnPlatformVersion("3.3.0-M2")
+	@ConditionalOnRequestedDependency("docker-compose")
+	ComposeFileCustomizer activeMQClassicComposeFileCustomizer(DockerServiceResolver serviceResolver) {
+		return (composeFile) -> serviceResolver.doWith("activeMQClassic",
+				(service) -> composeFile.services().add("activemq", service));
+	}
+
 }

start-site/src/test/java/io/spring/start/site/extension/dependency/activemq/ActiveMQProjectGenerationConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
  * Tests for {@link ActiveMQProjectGenerationConfiguration}.
  *
  * @author Stephane Nicoll
+ * @author Eddú Meléndez
  */
 class ActiveMQProjectGenerationConfigurationTests extends AbstractExtensionTests {
 
@@ -54,4 +55,11 @@ void dockerComposeCreatesAppropriateService() {
 		assertThat(composeFile(request)).hasSameContentAs(new ClassPathResource("compose/activemq.yaml"));
 	}
 
+	@Test
+	void dockerComposeCreatesAppropriateServiceWithVersion33() {
+		ProjectRequest request = createProjectRequest("docker-compose", "activemq");
+		request.setBootVersion("3.3.0-M2");
+		assertThat(composeFile(request)).hasSameContentAs(new ClassPathResource("compose/activemq-classic.yaml"));
+	}
+
 }

start-site/src/test/resources/compose/activemq-classic.yaml

@@ -0,0 +1,5 @@
+services:
+  activemq:
+    image: 'apache/activemq-classic:latest'
+    ports:
+      - '61616'