From 7da588539f7203975dd56b6bfd089caf03457c96 Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Fri, 23 Jul 2021 10:40:12 +0200
Subject: Revert "Remove jersey servlet and jaxb [run-systemtest]"

---
 vespa_jersey2/pom.xml | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'vespa_jersey2/pom.xml')

diff --git a/vespa_jersey2/pom.xml b/vespa_jersey2/pom.xml
index 9d3c00aebd5..c39b92cd371 100644
--- a/vespa_jersey2/pom.xml
+++ b/vespa_jersey2/pom.xml
@@ -19,6 +19,14 @@
       <groupId>javax.ws.rs</groupId>
       <artifactId>javax.ws.rs-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-servlet-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.containers</groupId>
+      <artifactId>jersey-container-servlet</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-json-jackson</artifactId>
@@ -55,27 +63,6 @@
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-jsr310</artifactId>
     </dependency>
-
-    <dependency>
-      <!-- Previously pulled in by jersey-container-servlet-core. Contains packages imported by
-      jersey-entity-filtering, which is used by jersey-media-json-jackson, which is again useed by hosted Vespa
-      framework bundles, July 2021. -->
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-server</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.glassfish.jersey.media</groupId>
-          <artifactId>jersey-media-jaxb</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <!-- Previously pulled in by jersey-container-servlet-core.
-      Contains packages imported by hosted user applications, July 2021. -->
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
-- 
cgit v1.2.3