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-7237] Updating the starters to depend on 1.5.x on the master, thanks to Dennis Kieselhorst and Raja Kolli
Date Fri, 03 Feb 2017 17:03:33 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 4a30203a0 -> 63daada33


[CXF-7237] Updating the starters to depend on 1.5.x on the master, thanks to Dennis Kieselhorst
and Raja Kolli


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

Branch: refs/heads/master
Commit: 63daada33c83c7900d5678ad495a0e764b3506de
Parents: 4a30203
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Fri Feb 3 17:03:16 2017 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Fri Feb 3 17:03:16 2017 +0000

----------------------------------------------------------------------
 distribution/src/main/release/samples/pom.xml                      | 2 +-
 .../cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java   | 2 +-
 parent/pom.xml                                                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/63daada3/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 3d50f42..9b2af93 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,7 +30,7 @@
         <!-- don't deploy the samples, kind of pointless -->
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>1.4.3.RELEASE</spring.boot.version>
+        <spring.boot.version>1.5.1.RELEASE</spring.boot.version>
         <spring.cloud.eureka.version>1.1.3.RELEASE</spring.cloud.eureka.version>
     </properties>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cxf/blob/63daada3/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 bfc72fc..1c375c1 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,7 +23,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.test.EnvironmentTestUtils;
+import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.test.util.ReflectionTestUtils;

http://git-wip-us.apache.org/repos/asf/cxf/blob/63daada3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e399855..fadbd8f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,7 +147,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.2.9.RELEASE</cxf.spring.version>
-        <cxf.spring.boot.version>1.4.3.RELEASE</cxf.spring.boot.version>
+        <cxf.spring.boot.version>1.5.1.RELEASE</cxf.spring.boot.version>
         <cxf.spring.security.version>4.2.0.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