From 7e67bec9a611472fb6982b85f9ebbaa1b05ace4c Mon Sep 17 00:00:00 2001
From: Marcin Mazurek <63855724+bbzurek@users.noreply.github.com>
Date: Mon, 1 Aug 2022 17:10:46 +0100
Subject: [PATCH] - latest dependencies - fixed ObjectMapper in `radio` goal

---
 boat-maven-plugin/src/it/example/pom.xml       | 18 +++++++++---------
 .../com/backbase/oss/boat/radio/RadioMojo.java |  5 ++++-
 .../libraries/spring-boot/pom.mustache         | 14 +++++++-------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/boat-maven-plugin/src/it/example/pom.xml b/boat-maven-plugin/src/it/example/pom.xml
index d48cf57bf..197a3c8b3 100644
--- a/boat-maven-plugin/src/it/example/pom.xml
+++ b/boat-maven-plugin/src/it/example/pom.xml
@@ -12,9 +12,9 @@
 
         <boat-maven-plugin.version>@pom.version@</boat-maven-plugin.version>
 <!--        <boat-maven-plugin.version>0.12.0-SNAPSHOT</boat-maven-plugin.version>-->
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
+        <jackson-databind-nullable-version>0.2.3</jackson-databind-nullable-version>
 
-        <jackson.version>2.11.3</jackson.version>
+        <jackson.version>2.13.3</jackson.version>
         <jackson.version.annotations>${jackson.version}</jackson.version.annotations>
         <jackson.version.core>${jackson.version}</jackson.version.core>
         <jackson.version.databind>${jackson.version}</jackson.version.databind>
@@ -29,7 +29,7 @@
         <!-- JPMS Library Updates-->
         <javax.activation.version>1.2.0</javax.activation.version>
 
-        <swagger-annotations-version>1.5.22</swagger-annotations-version>
+        <swagger-annotations-version>1.6.6</swagger-annotations-version>
 
     </properties>
 
@@ -57,7 +57,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.16</version>
+                <version>1.18.24</version>
             </dependency>
 
             <dependency>
@@ -105,13 +105,13 @@
             <dependency>
                 <groupId>javax.validation</groupId>
                 <artifactId>validation-api</artifactId>
-                <version>1.1.0.Final</version>
+                <version>2.0.1.Final</version>
             </dependency>
 
             <dependency>
                 <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator</artifactId>
-                <version>6.1.7.Final</version>
+                <version>6.2.3.Final</version>
             </dependency>
 
             <dependency>
@@ -123,7 +123,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-webflux</artifactId>
-                <version>2.5.12</version>
+                <version>2.7.2</version>
             </dependency>
 
             <dependency>
@@ -135,13 +135,13 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-web</artifactId>
-                <version>2.5.12</version>
+                <version>2.7.2</version>
             </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>5.2.22.RELEASE</version>
+                <version>5.3.22</version>
                 <scope>compile</scope>
             </dependency>
 
diff --git a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/radio/RadioMojo.java b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/radio/RadioMojo.java
index 75ffde6f9..a2e082d50 100644
--- a/boat-maven-plugin/src/main/java/com/backbase/oss/boat/radio/RadioMojo.java
+++ b/boat-maven-plugin/src/main/java/com/backbase/oss/boat/radio/RadioMojo.java
@@ -7,6 +7,7 @@
 import com.backbase.oss.boat.loader.OpenAPILoader;
 import com.backbase.oss.boat.loader.OpenAPILoaderException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import feign.auth.BasicAuthRequestInterceptor;
 import java.io.File;
 import java.io.IOException;
@@ -141,7 +142,9 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
         BasicAuthRequestInterceptor basicAuthRequestInterceptor = null;
 
-        ObjectMapper objectMapper = new ObjectMapper();
+        ObjectMapper objectMapper = JsonMapper.builder()
+            .findAndAddModules()
+            .build();
 
         if (StringUtils.isNotEmpty(boatBayUsername) && StringUtils.isNotEmpty(boatBayPassword)) {
             getLog().info("Basic Authentication set for username " + boatBayUsername);
diff --git a/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom.mustache b/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom.mustache
index 33997f0d4..1e76f72ff 100644
--- a/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom.mustache
+++ b/boat-scaffold/src/main/templates/boat-spring/libraries/spring-boot/pom.mustache
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>{{#java8}}2.3.3.RELEASE{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}}</version>
+        <version>{{#java8}}2.7.2{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}}</version>
     </parent>
 {{/parentOverridden}}
     <build>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.2.11</version>
+            <version>2.3.1</version>
         </dependency>
         {{/useSpringfox}}
         {{^useSpringfox}}
@@ -113,7 +113,7 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.5.14</version>
+            <version>1.6.6</version>
         </dependency>
         <!-- @Nullable annotation -->
         <dependency>
@@ -156,14 +156,14 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.2.1</version>
+            <version>0.2.3</version>
         </dependency>
 {{/openApiNullable}}
 {{#useLombokAnnotations}}
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
+            <version>1.18.24</version>
             <scope>provided</scope>
         </dependency>
 {{/useLombokAnnotations}}
@@ -186,12 +186,12 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.3.2</version>
+            <version>2.5.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-            <version>{{#java8}}2.3.3.RELEASE{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}}</version>
+            <version>{{#java8}}2.7.2{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}}</version>
         </dependency>
     <!-- END Virtual Service API support -->
 {{/virtualService}}