From 9f381dabe52ca0158004c2046a822cf7070631d3 Mon Sep 17 00:00:00 2001
From: m-brophy <mbrophy@redhat.com>
Date: Wed, 15 Nov 2023 10:56:59 +0000
Subject: [PATCH 1/4] upgrade jackson-databind

Signed-off-by: m-brophy <mbrophy@redhat.com>
---
 pom.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f56d34e05..614273b34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,9 +31,9 @@
         <wildfly.artifactId>wildfly-dist</wildfly.artifactId>
         <version.wildfly>23.0.2.Final</version.wildfly>
         <wildfly.directory>wildfly-${version.wildfly}</wildfly.directory>
-        <version.jackson>2.13.4</version.jackson>
-        <version.jackson.databind>2.13.4.2</version.jackson.databind>
-        <version.resteasy>4.7.8.Final</version.resteasy>
+        <version.jackson>2.15.2</version.jackson>
+        <version.jackson.databind>2.15.2</version.jackson.databind>
+        <version.resteasy>4.7.9.Final</version.resteasy>
         <version.jboss.javaee>1.0.1.Final</version.jboss.javaee>
 
         <windup.web.scm.connection>scm:git:https://github.com/windup/windup-web.git</windup.web.scm.connection>
@@ -205,6 +205,11 @@
                 <artifactId>resteasy-jackson2-provider</artifactId>
                 <version>${version.resteasy}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${version.jackson.databind}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-drone-bom</artifactId>

From 1070f362cd1a795ba8dd213fb116e3b9fdca12b2 Mon Sep 17 00:00:00 2001
From: m-brophy <mbrophy@redhat.com>
Date: Fri, 17 Nov 2023 13:54:42 +0000
Subject: [PATCH 2/4] override jackson-core version from
 resteasy-jackson2-provider

Signed-off-by: m-brophy <mbrophy@redhat.com>
---
 .../windup/web/services/json/WindupExecutionJSONUtil.java    | 1 +
 pom.xml                                                      | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java b/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java
index dfaa196c0..e71eae886 100644
--- a/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java
+++ b/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.ser.FilterProvider;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+//import com.fasterxml.jackson.core.exc.StreamWriteException;
 import org.jboss.windup.web.services.model.WindupExecution;
 
 import java.io.File;
diff --git a/pom.xml b/pom.xml
index 614273b34..d18d6e984 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,6 +210,11 @@
                 <artifactId>jackson-databind</artifactId>
                 <version>${version.jackson.databind}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-drone-bom</artifactId>

From 2c574732267a65a420781c962e7e02c3ec5904c8 Mon Sep 17 00:00:00 2001
From: m-brophy <mbrophy@redhat.com>
Date: Fri, 17 Nov 2023 13:59:44 +0000
Subject: [PATCH 3/4] remove unneeded import

Signed-off-by: m-brophy <mbrophy@redhat.com>
---
 .../jboss/windup/web/services/json/WindupExecutionJSONUtil.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java b/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java
index e71eae886..dfaa196c0 100644
--- a/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java
+++ b/model/src/main/java/org/jboss/windup/web/services/json/WindupExecutionJSONUtil.java
@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.ser.FilterProvider;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
-//import com.fasterxml.jackson.core.exc.StreamWriteException;
 import org.jboss.windup.web.services.model.WindupExecution;
 
 import java.io.File;

From 86465c53cb73018cf6593c4e75c049fb31e54b70 Mon Sep 17 00:00:00 2001
From: m-brophy <mbrophy@redhat.com>
Date: Mon, 27 Nov 2023 14:55:02 +0000
Subject: [PATCH 4/4] add jackson-annotations dependency to fix test failures

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index d18d6e984..6706393a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,6 +215,11 @@
                 <artifactId>jackson-core</artifactId>
                 <version>${version.jackson}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${version.jackson}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-drone-bom</artifactId>