SpringCloud/spring-cloud-core-tests
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating boot dependency and fixing example.com communication to be https

Browse Source
This commit is contained in:
Ryan Baxter
2019-05-22 14:04:40 -04:00
parent f38b080c2e
commit 9b762b0c05
40 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
bus/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
config-client-decrypt/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
config-client/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
config-retry/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

4
config-retry/src/test/java/demo/StandaloneClientApplicationTests.java
View File

@@ -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(

2
configserver-bootstrap/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
configserver-eureka/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
configserver/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
eureka-client/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
eureka-first/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
eureka-noweb/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
eureka-server/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
feign-eager-instantiation/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
feign-eureka/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
feign-eureka/src/main/java/demo/HelloClientApplication.java
View File

@@ -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;
}

2
feign-hystrix/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
feign-hystrix/src/main/java/demo/FeignClientApplication.java
View File

@@ -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();

4
feign-hystrix/src/test/java/demo/FeignClientWithServerListApplicationTests.java
View File

@@ -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 {

2
feign/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
feign/src/main/java/demo/FeignClientApplication.java
View File

@@ -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)

4
feign/src/test/java/demo/FeignClientWithServerListApplicationTests.java
View File

@@ -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 {

2
hystrix-amqp/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
hystrix/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
netflix-sidecar/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
noweb/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
oauth2-ribbon/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
oauth2-zuul/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
ribbon-default-config/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
ribbon-eureka/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
sleuth/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
stream-bus/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
turbine-amqp/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
turbine/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
vanilla/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
zipkin/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
zuul-config-discovery/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>

2
zuul-proxy-eureka/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
zuul-proxy/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

2
zuul/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.10.BUILD-SNAPSHOT</version>
<version>1.5.21.BUILD-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>