Skip to content

S
spring-boot
Commit c3ab4b87 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.2.x' 

Closes gh-19504
parents 6fc52b05 66eb2a41
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConfigurationCustomizer.java
View file @ c3ab4b87
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
package org.springframework.boot.autoconfigure.jms.artemis; package org.springframework.boot.autoconfigure.jms.artemis;
import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS; import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
/** /**
* Callback interface that can be implemented by beans wishing to customize the Artemis * Callback interface that can be implemented by beans wishing to customize the Artemis
* JMS server {@link Configuration} before it is used by an auto-configured * JMS server {@link Configuration} before it is used by an auto-configured
* {@link EmbeddedJMS} instance. * {@link EmbeddedActiveMQ} instance.
* *
* @author Eddú Meléndez * @author Eddú Meléndez
* @author Phillip Webb * @author Phillip Webb
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment