From a99e23f9fc9b2835858d14747243b1c16fe4c0f6 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 12 Dec 2016 12:31:01 +0000 Subject: [PATCH] Update to Boot 1.5.0 --- pom.xml | 2 +- spring-cloud-netflix-dependencies/pom.xml | 2 +- .../eureka/server/ApplicationContextTests.java | 3 ++- .../eureka/server/ApplicationServletPathTests.java | 7 ++++--- .../netflix/eureka/server/ApplicationTests.java | 6 +++--- ...rMetricsHandlerInterceptorIntegrationTests.java | 14 +++++++------- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 9fe85de7..83e2aaec 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 2ebb236b..71f2ea9f 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.2.2.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT spring-cloud-netflix-dependencies diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java index 11f80ae2..5b9a5ae3 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationContextTests.java @@ -42,7 +42,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { - "spring.application.name=eureka", "server.contextPath=/context" }) + "spring.application.name=eureka", "server.contextPath=/context", + "management.security.enabled=false" }) public class ApplicationContextTests { @Value("${local.server.port}") diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java index 90e70ac6..61b3e0be 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationServletPathTests.java @@ -24,9 +24,9 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; @@ -42,10 +42,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { - "spring.application.name=eureka", "server.servletPath=/servlet" }) + "spring.application.name=eureka", "server.servletPath=/servlet", + "management.security.enabled=false" }) public class ApplicationServletPathTests { - @Value("${local.server.port}") + @LocalServerPort private int port = 0; @Configuration diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java index 22e46a89..5e9903dc 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java @@ -30,9 +30,9 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.client.TestRestTemplate; @@ -52,10 +52,10 @@ import com.netflix.eureka.resources.ServerCodecs; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT, value = { - "spring.jmx.enabled=true" }) + "spring.jmx.enabled=true", "management.security.enabled=false" }) public class ApplicationTests { - @Value("${local.server.port}") + @LocalServerPort private int port = 0; @Autowired diff --git a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsHandlerInterceptorIntegrationTests.java b/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsHandlerInterceptorIntegrationTests.java index dca7d8c3..ef03544e 100644 --- a/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsHandlerInterceptorIntegrationTests.java +++ b/spring-cloud-netflix-spectator/src/test/java/org/springframework/cloud/netflix/metrics/spectator/SpectatorMetricsHandlerInterceptorIntegrationTests.java @@ -13,6 +13,10 @@ package org.springframework.cloud.netflix.metrics.spectator; +import static org.junit.Assert.assertFalse; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + import javax.servlet.http.HttpServletRequest; import org.junit.Assert; @@ -20,8 +24,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.autoconfigure.test.ImportAutoConfiguration; import org.springframework.cloud.netflix.metrics.MetricsHandlerInterceptor; import org.springframework.cloud.netflix.metrics.servo.ServoMonitorCache; import org.springframework.context.annotation.Bean; @@ -48,10 +52,6 @@ import com.netflix.servo.MonitorRegistry; import com.netflix.servo.monitor.BasicTimer; import com.netflix.servo.monitor.MonitorConfig; -import static org.junit.Assert.assertFalse; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - /** * @author Jon Schneider */ @@ -74,8 +74,8 @@ public class SpectatorMetricsHandlerInterceptorIntegrationTests { @Test public void autoConfigurationWiresTheMetricsInterceptor() { - assertFalse(webAppContext.getBeansOfType(MetricsHandlerInterceptor.class) - .isEmpty()); + assertFalse( + webAppContext.getBeansOfType(MetricsHandlerInterceptor.class).isEmpty()); } @Before