#6 Upgrade to Spring Boot 2.4.2

Author: awconstable

pom.xml

@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.4.RELEASE</version>
+		<version>2.4.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -44,7 +44,7 @@
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-dependencies</artifactId>
-                    <version>Hoxton.SR8</version>
+                    <version>2020.0.1</version>
                     <type>pom</type>
                     <scope>import</scope>
                 </dependency>

web/pom.xml

@@ -155,13 +155,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
-
-        <!-- remove this once we switch to consul -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

…/resources/config/application.properties …rc/main/resources/application.propertiesweb/src/main/resources/config/application.properties renamed to web/src/main/resources/application.properties web/src/main/resources/config/application.properties renamed to web/src/main/resources/application.properties

@@ -1,8 +1,9 @@
+spring.application.name=team-happiness
 spring.data.rest.base-path=/data
 spring.mvc.static-path-pattern=/static/**
-spring.resources.chain.enabled=true
-spring.resources.chain.strategy.content.enabled=true
-spring.resources.chain.strategy.content.paths=/**
+spring.web.resources.chain.enabled=true
+spring.web.resources.chain.strategy.content.enabled=true
+spring.web.resources.chain.strategy.content.paths=/**
 management.endpoints.web.exposure.include=*
 server.port=8080
 #Configuring the consul registration center