diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 275052c..86903de 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/bus/pom.xml b/bus/pom.xml
index 7d9083c..1804f01 100644
--- a/bus/pom.xml
+++ b/bus/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml
index fc2f944..a91d0d8 100644
--- a/config-client-decrypt/pom.xml
+++ b/config-client-decrypt/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/config-client/pom.xml b/config-client/pom.xml
index b441730..cd6ad8b 100644
--- a/config-client/pom.xml
+++ b/config-client/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/config-retry/pom.xml b/config-retry/pom.xml
index b043ffe..894c8e2 100644
--- a/config-retry/pom.xml
+++ b/config-retry/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java b/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java
index 4070c80..3d1b272 100644
--- a/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java
+++ b/config-retry/src/test/java/demo/StandaloneClientApplicationTests.java
@@ -76,12 +76,12 @@ public class StandaloneClientApplicationTests {
.values().iterator().next();
RetryTemplate retryTemplate = null;
if(RetryOperationsInterceptor.class.isInstance(obj)) {
- //Prior to Boot 1.5.10
+ //Prior to Boot 1.5.21
RetryOperationsInterceptor interceptor = (RetryOperationsInterceptor)obj;
retryTemplate = (RetryTemplate) ReflectionTestUtils.getField(
interceptor, "retryOperations");
} else if(Map.class.isInstance(obj)) {
- //Boot 1.5.10 and later
+ //Boot 1.5.21 and later
Object[] methodInterceptors = ((Map)obj).values().toArray();
RetryOperationsInterceptor interceptor = (RetryOperationsInterceptor)methodInterceptors[0];
retryTemplate = (RetryTemplate)ReflectionTestUtils.getField(
diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml
index 0c237df..2c88bad 100644
--- a/configserver-bootstrap/pom.xml
+++ b/configserver-bootstrap/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml
index e6f4c51..5e7dbf7 100644
--- a/configserver-eureka/pom.xml
+++ b/configserver-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/configserver/pom.xml b/configserver/pom.xml
index b5341a1..5f9d0d3 100644
--- a/configserver/pom.xml
+++ b/configserver/pom.xml
@@ -13,7 +13,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml
index e415d3d..1640dc7 100644
--- a/eureka-client/pom.xml
+++ b/eureka-client/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml
index 914c96f..1f84602 100644
--- a/eureka-first/pom.xml
+++ b/eureka-first/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml
index d2e6989..a905858 100644
--- a/eureka-noweb/pom.xml
+++ b/eureka-noweb/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml
index 3e5e4a9..653ef88 100644
--- a/eureka-server/pom.xml
+++ b/eureka-server/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/feign-eager-instantiation/pom.xml b/feign-eager-instantiation/pom.xml
index 899c872..0d3a2c8 100644
--- a/feign-eager-instantiation/pom.xml
+++ b/feign-eager-instantiation/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml
index de96c7a..ae2a76a 100644
--- a/feign-eureka/pom.xml
+++ b/feign-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/feign-eureka/src/main/java/demo/HelloClientApplication.java b/feign-eureka/src/main/java/demo/HelloClientApplication.java
index 3f6bb60..90613a2 100644
--- a/feign-eureka/src/main/java/demo/HelloClientApplication.java
+++ b/feign-eureka/src/main/java/demo/HelloClientApplication.java
@@ -57,7 +57,7 @@ class HelloRibbonClientConfiguration {
//because of this, it doesn't use eureka to lookup the server,
// but the classpath is tested
BaseLoadBalancer balancer = new BaseLoadBalancer();
- balancer.setServersList(Arrays.asList(new Server("example.com", 80)));
+ balancer.setServersList(Arrays.asList(new Server("example.com", 443)));
return balancer;
}
diff --git a/feign-hystrix/pom.xml b/feign-hystrix/pom.xml
index 570ee43..05678d3 100644
--- a/feign-hystrix/pom.xml
+++ b/feign-hystrix/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/feign-hystrix/src/main/java/demo/FeignClientApplication.java b/feign-hystrix/src/main/java/demo/FeignClientApplication.java
index 34da72c..35d2317 100644
--- a/feign-hystrix/src/main/java/demo/FeignClientApplication.java
+++ b/feign-hystrix/src/main/java/demo/FeignClientApplication.java
@@ -31,7 +31,7 @@ public class FeignClientApplication {
}
}
-@FeignClient(name = "example", url = "example.com", fallback=FallbackClient.class)
+@FeignClient(name = "example", url = "https://example.com", fallback=FallbackClient.class)
interface UrlRestClient {
@RequestMapping(value="/", method = RequestMethod.GET)
String hello();
diff --git a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
index d5ac4c1..edfd1d7 100644
--- a/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
+++ b/feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
@@ -20,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
//Increase hystrix timeout or else requests timeout on CI server
@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"myexample.ribbon.listOfServers:example.com", "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000"})
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"myexample.ribbon.listOfServers:example.com:443",
+ "myexample.ribbon.IsSecure:true",
+ "hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000"})
@DirtiesContext
public class FeignClientWithServerListApplicationTests {
diff --git a/feign/pom.xml b/feign/pom.xml
index 53005ed..b92c538 100644
--- a/feign/pom.xml
+++ b/feign/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/feign/src/main/java/demo/FeignClientApplication.java b/feign/src/main/java/demo/FeignClientApplication.java
index 785c969..fd81aad 100644
--- a/feign/src/main/java/demo/FeignClientApplication.java
+++ b/feign/src/main/java/demo/FeignClientApplication.java
@@ -16,7 +16,7 @@ public class FeignClientApplication {
}
}
-@FeignClient(name = "example", url = "example.com")
+@FeignClient(name = "example", url = "https://example.com")
@RequestMapping("/")
interface RestClient {
@RequestMapping(method = RequestMethod.GET)
diff --git a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
index d92d6ed..8e61ba5 100644
--- a/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
+++ b/feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
// We disable Hystrix because we are not concerned about testing circuit breakers in this
// test and it eliminates hystrix timeouts from messing with the request
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
- "myexample.ribbon.listOfServers:example.com", "feign.hystrix.enabled=false" })
+ "myexample.ribbon.listOfServers:example.com:443",
+ "myexample.ribbon.IsSecure:true",
+ "feign.hystrix.enabled=false" })
@DirtiesContext
public class FeignClientWithServerListApplicationTests {
diff --git a/hystrix-amqp/pom.xml b/hystrix-amqp/pom.xml
index 85868b7..a0a63b1 100644
--- a/hystrix-amqp/pom.xml
+++ b/hystrix-amqp/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/hystrix/pom.xml b/hystrix/pom.xml
index 86f155a..24d8130 100644
--- a/hystrix/pom.xml
+++ b/hystrix/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml
index 6a7fbea..462996f 100644
--- a/netflix-sidecar/pom.xml
+++ b/netflix-sidecar/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/noweb/pom.xml b/noweb/pom.xml
index efdcc74..64d45f5 100644
--- a/noweb/pom.xml
+++ b/noweb/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml
index e74fff6..5fdb4e0 100644
--- a/oauth2-ribbon/pom.xml
+++ b/oauth2-ribbon/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/oauth2-zuul/pom.xml b/oauth2-zuul/pom.xml
index fe364aa..624eee5 100644
--- a/oauth2-zuul/pom.xml
+++ b/oauth2-zuul/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml
index e54b3ef..a908015 100644
--- a/ribbon-default-config/pom.xml
+++ b/ribbon-default-config/pom.xml
@@ -4,7 +4,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml
index efdeb6e..24061d4 100644
--- a/ribbon-eureka/pom.xml
+++ b/ribbon-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/sleuth/pom.xml b/sleuth/pom.xml
index 4307c84..ff8c978 100644
--- a/sleuth/pom.xml
+++ b/sleuth/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml
index 730a5f0..4cbe39f 100644
--- a/stream-bus/pom.xml
+++ b/stream-bus/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/turbine-amqp/pom.xml b/turbine-amqp/pom.xml
index 1344925..5fa01b1 100644
--- a/turbine-amqp/pom.xml
+++ b/turbine-amqp/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/turbine/pom.xml b/turbine/pom.xml
index 8801b88..c7e1352 100644
--- a/turbine/pom.xml
+++ b/turbine/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/vanilla/pom.xml b/vanilla/pom.xml
index b863479..5715fdd 100644
--- a/vanilla/pom.xml
+++ b/vanilla/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/zipkin/pom.xml b/zipkin/pom.xml
index 2d1dbef..e3b3c8d 100644
--- a/zipkin/pom.xml
+++ b/zipkin/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/zuul-config-discovery/pom.xml b/zuul-config-discovery/pom.xml
index 9ddfdd1..936a329 100755
--- a/zuul-config-discovery/pom.xml
+++ b/zuul-config-discovery/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/zuul-proxy-eureka/pom.xml b/zuul-proxy-eureka/pom.xml
index f150d7b..87c9eee 100644
--- a/zuul-proxy-eureka/pom.xml
+++ b/zuul-proxy-eureka/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/zuul-proxy/pom.xml b/zuul-proxy/pom.xml
index adb4679..9728842 100644
--- a/zuul-proxy/pom.xml
+++ b/zuul-proxy/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT
diff --git a/zuul/pom.xml b/zuul/pom.xml
index db7db4f..4139039 100644
--- a/zuul/pom.xml
+++ b/zuul/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.5.10.BUILD-SNAPSHOT
+ 1.5.21.BUILD-SNAPSHOT