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/12/14 17:02:43 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 3d83726b8f085c57b473ec7c68c5bb9d1ded4ac1
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Thu Dec 14 18:00:08 2017 +0100
Spring 5/ Spring Boot 2
Spring 5/ Spring Boot 2
---
.../rs/service/SampleRestApplicationTest.java | 2 +-
.../jax_rs/spring_boot_scan/application/pom.xml | 2 +-
.../sample/rs/service/SampleRestApplication.java | 17 ------------
.../rs/service/SampleRestApplicationTest.java | 2 +-
.../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +-
.../spring_boot_scan/eureka-registry/pom.xml | 2 +-
.../release/samples/jax_rs/spring_security/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/beans.xml | 2 +-
.../sample/ws/service/SampleWsApplicationTest.java | 2 +-
distribution/src/main/release/samples/pom.xml | 30 ++++++++++++++++++++--
.../autoconfigure/CxfAutoConfigurationTests.java | 4 +--
parent/pom.xml | 6 ++---
pom.xml | 11 ++++++++
13 files changed, 52 insertions(+), 32 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/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 815638f..3e990b1 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -46,7 +46,7 @@
<!-- Eureka Service Discovery Client -->
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka</artifactId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring.cloud.eureka.version}</version>
</dependency>
<!-- Actuator Endpoints -->
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index 1f3ff56..f085e03 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -17,32 +17,15 @@
* under the License.
*/
package sample.rs.service;
-import java.util.Collections;
-
-import com.codahale.metrics.MetricRegistry;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
-import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
-import org.springframework.boot.actuate.metrics.reader.MetricRegistryMetricReader;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.context.annotation.Bean;
@SpringBootApplication
@EnableEurekaClient
public class SampleRestApplication {
- @Bean
- public MetricRegistry metricRegistry() {
- return new MetricRegistry();
- }
-
- @Bean
- public MetricsEndpoint metricsEndpoint(final MetricRegistry registry) {
- return new MetricsEndpoint(Collections.singleton(new MetricReaderPublicMetrics(
- new MetricRegistryMetricReader(registry))));
- }
public static void main(String[] args) {
SpringApplication.run(SampleRestApplication.class, args);
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/jax_rs/spring_boot_scan/client/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
index acfb9af..dbefc3a 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
@@ -42,7 +42,7 @@
<!-- Eureka Service Discovery Client -->
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka</artifactId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring.cloud.eureka.version}</version>
</dependency>
<!-- Zest Circuit Breaker used by CXF Failover Feature -->
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 0bb2977..b6dd78e 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka-server</artifactId>
+ <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
index 255cb3e..fadc376 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
@@ -32,7 +32,7 @@
<properties>
<cxf.version>${project.version}</cxf.version>
<aspectj.version>1.5.4</aspectj.version>
- <spring.security.version>3.2.5.RELEASE</spring.security.version>
+ <spring.security.version>5.0.0.RELEASE</spring.security.version>
</properties>
<build>
<finalName>JAXRSSpringSecurity</finalName>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
index a46433f..67d60f8 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spr [...]
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring- [...]
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<jaxrs:server id="bookservice" address="/">
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 07ad837..76233ba 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,8 +30,8 @@
<!-- 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.9.RELEASE</spring.boot.version>
- <spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
+ <spring.boot.version>2.0.0.M7</spring.boot.version>
+ <spring.cloud.eureka.version>2.0.0.M5</spring.cloud.eureka.version>
</properties>
<dependencies>
<dependency>
@@ -234,4 +234,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/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 e5d85b4..1f4dfa6 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
@@ -74,7 +74,7 @@ public class CxfAutoConfigurationTests {
public void customPathWithTrailingSlash() {
load(CxfAutoConfiguration.class, "cxf.path=/valid/");
assertThat(this.context.getBean(ServletRegistrationBean.class).getUrlMappings(),
- (Matcher<Iterable<? super String>>) hasItem("/valid/*"));
+ (Matcher) hasItem("/valid/*"));
}
@Test
@@ -83,7 +83,7 @@ public class CxfAutoConfigurationTests {
assertThat(this.context.getBeansOfType(ServletRegistrationBean.class).size(),
equalTo(1));
assertThat(this.context.getBean(ServletRegistrationBean.class).getUrlMappings(),
- (Matcher<Iterable<? super String>>) hasItem("/valid/*"));
+ (Matcher) hasItem("/valid/*"));
}
@Test
diff --git a/parent/pom.xml b/parent/pom.xml
index e27c8a5..ad5524a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -153,9 +153,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.13.RELEASE</cxf.spring.version>
- <cxf.spring.boot.version>1.5.9.RELEASE</cxf.spring.boot.version>
- <cxf.spring.security.version>4.2.3.RELEASE</cxf.spring.security.version>
+ <cxf.spring.version>5.0.2.RELEASE</cxf.spring.version>
+ <cxf.spring.boot.version>2.0.0.M7</cxf.spring.boot.version>
+ <cxf.spring.security.version>5.0.0.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
diff --git a/pom.xml b/pom.xml
index 291ba6f..4f71e56 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>.