From 4986a673e01945e2f9c79192c851a11a3543e29f Mon Sep 17 00:00:00 2001
From: Chris Phillipson <cphillipson@pivotal.io>
Date: Mon, 7 Jun 2021 07:02:21 -0700
Subject: [PATCH] Upgrade to Vaadin 20 and fix issue with service registration
 at boot

* Upgrade to latest available plugin and dependency versions
* Move properties from bootstrap.yml to application.yml
* Add caffeine as backing cache provider for client-side load-balancer
* Adjust logging levels to provide insight into DiscoveryClient bootstrap
* Fix activation of cloud profile
---
 pom.xml                              | 15 ++++++++++-----
 src/main/resources/application.yml   | 17 ++++++++++++++++-
 src/main/resources/bootstrap.yml     |  8 --------
 src/main/resources/log4j2-spring.xml |  6 ++++--
 4 files changed, 30 insertions(+), 16 deletions(-)
 delete mode 100644 src/main/resources/bootstrap.yml

diff --git a/pom.xml b/pom.xml
index 411192a..70b211b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<vaadin.version>19.0.8</vaadin.version>
+		<vaadin.version>20.0.1</vaadin.version>
 		<lombok.version>1.18.20</lombok.version>
 	</properties>
 
@@ -84,12 +84,12 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>2.12.2</version>
+			<version>2.12.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.12.2</version>
+			<version>2.12.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -158,6 +158,11 @@
 			<artifactId>resilience4j-annotations</artifactId>
 			<version>1.7.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.ben-manes.caffeine</groupId>
+			<artifactId>caffeine</artifactId>
+			<version>3.0.2</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.vaadin</groupId>
@@ -216,7 +221,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>2020.0.2</version>
+				<version>2020.0.3</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -321,7 +326,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.6</version>
+				<version>0.8.7</version>
 				<executions>
 					<execution>
 						<id>before-unit-test-execution</id>
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4afbec1..73412d6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,11 +1,20 @@
 spring:
+  application:
+    name: cf-hoover-ui
   codec:
     max-in-memory-size: 512000000
   cloud:
+    discovery:
+      enabled: false
     loadbalancer:
       ribbon:
         enabled: false
 
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: ${vcap.services.hooverRegistry.credentials.uri:http://localhost:8761}/eureka/
+
 management:
   endpoints:
     web:
@@ -24,7 +33,13 @@ cron:
 
 ---
 spring:
-  profiles: cloud
+  config:
+    activate:
+      on-profile: cloud
+
+  cloud:
+    discovery:
+      enabled: true
 
 management:
   cloudfoundry:
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
deleted file mode 100644
index 0ce0a92..0000000
--- a/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-spring:
-  application:
-    name: cf-hoover-ui
-
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: ${vcap.services.hooverRegistry.credentials.uri:http://localhost:8761}/eureka/
diff --git a/src/main/resources/log4j2-spring.xml b/src/main/resources/log4j2-spring.xml
index 272450e..0a38bb4 100644
--- a/src/main/resources/log4j2-spring.xml
+++ b/src/main/resources/log4j2-spring.xml
@@ -29,10 +29,12 @@
             <AppenderRef ref="RollingFile" />
         </Root>
 
-        <Logger name="io.pivotal.cfapp" level="trace" />
+        <Logger name="com.netflix.discovery" lever="debug" />
+        
         <!--
-        <Logger name="com.vaadin" level="debug" />
+        <Logger name="io.pivotal.cfapp" level="trace" />
         <Logger name="org.springframework" level="debug" />
+        <Logger name="com.vaadin" level="debug" />
         <Logger name="reactor.core" level="debug" />
         <Logger name="io.github.resilience4j" level="debug" />
         <Logger name="io.vavr" level="debug" />