From b0ee543947e2fd36febc86dd1295fb457d11df59 Mon Sep 17 00:00:00 2001
From: Chris Rohr <51920+chrisrohr@users.noreply.github.com>
Date: Mon, 20 Dec 2021 22:21:21 -0500
Subject: [PATCH] Add explicit dependencies to resolve conflicts

* jakarta.activation (com.sun.activation version)
* jersey-container-servlet-core
* netty-codec
---
 pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pom.xml b/pom.xml
index 404e19d7..9b8c95f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -379,6 +379,12 @@
                 <version>${jackson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.sun.activation</groupId>
+                <artifactId>jakarta.activation</artifactId>
+                <version>${jakarta.activation-api.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>jakarta.activation</groupId>
                 <artifactId>jakarta.activation-api</artifactId>
@@ -463,6 +469,12 @@
                 <version>${jersey.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.glassfish.jersey.containers</groupId>
+                <artifactId>jersey-container-servlet-core</artifactId>
+                <version>${jersey.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.glassfish.jersey.inject</groupId>
                 <artifactId>jersey-hk2</artifactId>
@@ -619,6 +631,12 @@
                 <version>${netty.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-common</artifactId>