cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-7198]upgrade to spring-boot 1.4.3
Date Thu, 02 Feb 2017 22:08:00 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 557538025 -> 4f542faea


[CXF-7198]upgrade to spring-boot 1.4.3


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4f542fae
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4f542fae
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4f542fae

Branch: refs/heads/3.1.x-fixes
Commit: 4f542faeaff542c92f93833fa846d47d9b74a392
Parents: 5575380
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Thu Dec 29 10:22:40 2016 +0800
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Feb 2 22:07:33 2017 +0000

----------------------------------------------------------------------
 integration/spring-boot/autoconfigure/pom.xml                 | 7 +++++++
 .../cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java   | 2 +-
 .../spring/boot/autoconfigure/CxfAutoConfigurationTests.java  | 2 +-
 parent/pom.xml                                                | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4f542fae/integration/spring-boot/autoconfigure/pom.xml
----------------------------------------------------------------------
diff --git a/integration/spring-boot/autoconfigure/pom.xml b/integration/spring-boot/autoconfigure/pom.xml
index 567928e..078c6d2 100644
--- a/integration/spring-boot/autoconfigure/pom.xml
+++ b/integration/spring-boot/autoconfigure/pom.xml
@@ -37,6 +37,13 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
         <!-- Optional -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <version>${cxf.spring.boot.version}</version>
+            <scope>test</scope>
+        </dependency>
+
         
         <!-- Annotation processing -->
         <dependency>

http://git-wip-us.apache.org/repos/asf/cxf/blob/4f542fae/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 4460c7e..22d0b74 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
@@ -32,8 +32,8 @@ 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.embedded.ServletRegistrationBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

http://git-wip-us.apache.org/repos/asf/cxf/blob/4f542fae/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
----------------------------------------------------------------------
diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
index cf99e20..6ed9fd7 100644
--- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
+++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
@@ -23,8 +23,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
 import org.springframework.boot.test.EnvironmentTestUtils;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;

http://git-wip-us.apache.org/repos/asf/cxf/blob/4f542fae/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 201e916..1e2e1b9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,7 +145,7 @@
         <cxf.slf4j.version>1.7.22</cxf.slf4j.version>
         <cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
         <cxf.spring.version>4.1.9.RELEASE</cxf.spring.version>
-        <cxf.spring.boot.version>1.3.6.RELEASE</cxf.spring.boot.version>
+        <cxf.spring.boot.version>1.4.3.RELEASE</cxf.spring.boot.version>
         <cxf.spring.security.version>3.2.10.RELEASE</cxf.spring.security.version>
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
         <cxf.spring.ldap.version>2.2.1.RELEASE</cxf.spring.ldap.version>


Mime
View raw message