Repository: cxf Updated Branches: refs/heads/master f46d64c8d -> 5e554a6a5
[CXF-7460] Support both Spring Boot 1.x and 2.x Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5e554a6a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5e554a6a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5e554a6a Branch: refs/heads/master Commit: 5e554a6a52f8990b748507498452db935a67b9d7 Parents: f46d64c Author: Dennis Kieselhorst <d...@apache.org> Authored: Mon Jul 31 16:40:56 2017 +0200 Committer: Dennis Kieselhorst <d...@apache.org> Committed: Mon Jul 31 16:40:56 2017 +0200 ---------------------------------------------------------------------- .../cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5e554a6a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java index d6eda2e..c8fe687 100644 --- a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java +++ b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java @@ -31,7 +31,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; -import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; @@ -48,7 +47,10 @@ import org.springframework.context.annotation.ImportResource; @ConditionalOnWebApplication @ConditionalOnClass({ SpringBus.class, CXFServlet.class }) @EnableConfigurationProperties(CxfProperties.class) -@AutoConfigureAfter(EmbeddedServletContainerAutoConfiguration.class) +@AutoConfigureAfter(name = { + "org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration", // Spring Boot 1.x + "org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration" // Spring Boot 2.x +}) public class CxfAutoConfiguration { @Autowired
