Merge branch '3.2.x'
Closes gh-39335
This commit is contained in:
commit
cd9b51d02c
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.springframework.boot.docker.compose.service.connection.activemq;
|
package org.springframework.boot.docker.compose.service.connection.activemq;
|
||||||
|
|
||||||
import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails;
|
|
||||||
import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQConnectionDetails;
|
import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQConnectionDetails;
|
||||||
import org.springframework.boot.docker.compose.core.RunningService;
|
import org.springframework.boot.docker.compose.core.RunningService;
|
||||||
import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory;
|
import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory;
|
||||||
@ -43,7 +42,7 @@ class ActiveMQDockerComposeConnectionDetailsFactory
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link RabbitConnectionDetails} backed by a {@code rabbitmq}
|
* {@link ActiveMQConnectionDetails} backed by a {@code activemq}
|
||||||
* {@link RunningService}.
|
* {@link RunningService}.
|
||||||
*/
|
*/
|
||||||
static class ActiveMQDockerComposeConnectionDetails extends DockerComposeConnectionDetails
|
static class ActiveMQDockerComposeConnectionDetails extends DockerComposeConnectionDetails
|
||||||
|
Loading…
x
Reference in New Issue
Block a user