You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2017/10/13 18:11:49 UTC
[cxf] 01/01: Spring 5/ Spring Boot 2
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch spring-5-boot-2
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b1b670ac63e52dfbe934b2502b39c37b9d9fb324
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Fri Sep 15 11:27:07 2017 +0200
Spring 5/ Spring Boot 2
---
.../rs/service/SampleRestApplicationTest.java | 2 +-
.../rs/service/SampleRestApplicationTest.java | 2 +-
.../sample/ws/service/SampleWsApplicationTest.java | 2 +-
distribution/src/main/release/samples/pom.xml | 28 +++++++++++++++++++++-
parent/pom.xml | 6 ++---
pom.xml | 11 +++++++++
6 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index d85654a..a424e9d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -24,7 +24,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.test.context.junit4.SpringRunner;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index d85654a..a424e9d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -24,7 +24,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.test.context.junit4.SpringRunner;
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
index 53f7277..b645ddb 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.rule.OutputCapture;
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 42c4197..e25507f 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.5.7.RELEASE</spring.boot.version>
+ <spring.boot.version>2.0.0.M5</spring.boot.version>
<spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
</properties>
<dependencies>
@@ -232,4 +232,30 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>spring-milestone</id>
+ <url>http://repo.spring.io/milestone/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>spring-milestone</id>
+ <url>http://repo.spring.io/milestone/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index a53cb20..5a2f84f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,9 +151,9 @@
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.25</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.version>4.3.11.RELEASE</cxf.spring.version>
- <cxf.spring.boot.version>1.5.7.RELEASE</cxf.spring.boot.version>
- <cxf.spring.security.version>4.2.3.RELEASE</cxf.spring.security.version>
+ <cxf.spring.version>5.0.0.RELEASE</cxf.spring.version>
+ <cxf.spring.boot.version>2.0.0.M5</cxf.spring.boot.version>
+ <cxf.spring.security.version>5.0.0.M5</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>2.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
diff --git a/pom.xml b/pom.xml
index 28f6e10..ff5f89c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,17 @@
<enabled>false</enabled>
</releases>
</repository>
+
+ <repository>
+ <id>spring-milestone</id>
+ <url>http://repo.spring.io/milestone/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
--
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <co...@cxf.apache.org>.