Skip to content

Commit

Permalink
Upgrade to Vaadin 20 and fix issue with service registration at boot
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
pacphi committed Jun 7, 2021
1 parent a85f260 commit 4986a67
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 16 deletions.
15 changes: 10 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
17 changes: 16 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -24,7 +33,13 @@ cron:

---
spring:
profiles: cloud
config:
activate:
on-profile: cloud

cloud:
discovery:
enabled: true

management:
cloudfoundry:
Expand Down
8 changes: 0 additions & 8 deletions src/main/resources/bootstrap.yml

This file was deleted.

6 changes: 4 additions & 2 deletions src/main/resources/log4j2-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down

0 comments on commit 4986a67

Please sign in to comment.