Update to Spring Boot 2.2.5 and Spring Cloud Hoxton.SR3

Author: Matt Raible

spring-boot+cloud/api-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.5.RELEASE</version>
+        <version>2.2.5.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
@@ -16,7 +16,7 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <spring-cloud.version>Hoxton.SR3</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.okta.spring</groupId>
             <artifactId>okta-spring-boot-starter</artifactId>
-            <version>1.2.0</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

spring-boot+cloud/api-gateway/src/main/java/com/example/apigateway/ApiGatewayApplication.java

@@ -14,7 +14,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
-import org.springframework.hateoas.Resources;
+import org.springframework.hateoas.CollectionModel;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
@@ -92,7 +92,7 @@ interface CarClient {
 
     @GetMapping("/cars")
     @CrossOrigin
-    Resources<Car> readCars();
+    CollectionModel<Car> readCars();
 }
 
 @RestController

spring-boot+cloud/api-gateway/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 spring.application.name=api-gateway
-okta.oauth2.issuer=https://dev-737523.oktapreview.com/oauth2/default
-okta.oauth2.client-id=0oafx05pu2pxhjgkC0h7
-okta.oauth2.client-secret=ozxBeuk7nE-oLhkUvINe1cxR3LITquTp7Jt2NvX7
+okta.oauth2.issuer=https://dev-133320.okta.com/oauth2/default
+okta.oauth2.client-id=0oa35aqn81ftCrz53357
+okta.oauth2.client-secret=lchv-e8ZLN3si7v84tVq-W4OT1l7kzkE5irBvDhs
 feign.hystrix.enabled=true
 hystrix.shareSecurityContext=true
 

spring-boot+cloud/demo.adoc

@@ -32,13 +32,6 @@ The brackets at the end of each step indicate the alias's or IntelliJ Live Templ
   sdk install java 11.0.2-open
   sdk default java 11.0.2-open
 
-. Add JAXB to `discovery-service` so it works with Java 11
-
-  <dependency>
-      <groupId>org.glassfish.jaxb</groupId>
-      <artifactId>jaxb-runtime</artifactId>
-  </dependency>
-
 . Add `@EnableEurekaServer` and properties to set port and turn off discovery
 
   server.port=8761
@@ -79,7 +72,7 @@ The brackets at the end of each step indicate the alias's or IntelliJ Live Templ
   <dependency>
     <groupId>com.okta.spring</groupId>
     <artifactId>okta-spring-boot-starter</artifactId>
-    <version>1.2.1</version>
+    <version>1.4.0</version>
   </dependency>
 
 . Create a web app on Okta, use `http://localhost:8080/login/oauth2/code/okta` for redirect URI

spring-boot+cloud/discovery-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.5.RELEASE</version>
+        <version>2.2.5.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
@@ -16,18 +16,14 @@
 
     <properties>
         <java.version>11</java.version>
-        <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+        <spring-cloud.version>Hoxton.SR3</spring-cloud.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>