Merge branch 'Finchley'

# Conflicts:
#	pom.xml

Author: spencergibb

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

customers-stores-ui/Dockerfile

@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+		<groupId>org.springframework.samples.rest</groupId>
+		<artifactId>rest-microservices</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+	</parent>
+	
+	<artifactId>rest-microservices-ui</artifactId>
+	
+	<properties>
+	</properties>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-gateway</artifactId>
+		</dependency>
+	</dependencies>
+	
+</project>

customers-stores-ui/app.groovy

@@ -0,0 +1,16 @@
+package example.ui;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.stereotype.Controller;
+
+@EnableDiscoveryClient
+@SpringBootApplication
+@Controller
+public class UiApp {
+
+	public static void main(String[] args) {
+		new SpringApplication(UiApp.class).run(args);
+	}
+}

customers-stores-ui/application.yml

@@ -0,0 +1,42 @@
+server:
+  port: 9900
+logging:
+  level:
+    com.netflix.discovery: 'OFF'
+    com.netflix.zuul: 'OFF'
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+  client:
+    registryFetchIntervalSeconds: 5
+
+hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
+ribbon:
+  ServerListRefreshInterval: 5000
+  ConnectTimeout: 3000
+  ReadTimeout: 60000
+
+spring:
+  cloud:
+    gateway:
+      routes:
+        - id: stores
+          uri: lb://stores
+          predicates:
+            - Path=/stores/**
+        - id: customers
+          uri: lb://customers
+          predicates:
+          - Path=/customers/**
+        - id: root
+          uri: no://op
+          predicates:
+          - Path=/
+          filters:
+          - RedirectTo=302, /index.html#/customers
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'