From 6e61c9bfaa7742334acbdbb817502644e075b35e Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Thu, 2 Jun 2022 16:01:42 +0200
Subject: Remove jersey related dependencies from parent poms and enforcers.

---
 container-dependency-versions/pom.xml | 101 +++-------------------------------
 1 file changed, 9 insertions(+), 92 deletions(-)

(limited to 'container-dependency-versions')

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index d213331da9e..feff08d9c6f 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -62,21 +62,6 @@
                 <artifactId>jackson-datatype-jsr310</artifactId>
                 <version>${jackson2.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                <artifactId>jackson-jaxrs-base</artifactId>
-                <version>${jackson2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                <artifactId>jackson-jaxrs-json-provider</artifactId>
-                <version>${jackson2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.module</groupId>
-                <artifactId>jackson-module-jaxb-annotations</artifactId>
-                <version>${jackson2.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -114,11 +99,6 @@
               <artifactId>javax.servlet-api</artifactId>
               <version>${javax.servlet-api.version}</version>
             </dependency>
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>${javax.validation-api.version}</version>
-            </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
@@ -127,25 +107,27 @@
 
             <!-- jaxb start -->
             <dependency>
-                <!-- Needed by felix -->
+                <!-- Exported from jdisc_core. Imported and directly used by e.g. vespa.factory -->
+                <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>${jaxb.version}</version>
             </dependency>
             <dependency>
-                <!-- Needed by jersey -->
+                <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-core</artifactId>
                 <version>${jaxb.version}</version>
             </dependency>
             <dependency>
-                <!-- Needed by jersey -->
+                <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>${jaxb.version}</version>
             </dependency>
             <dependency>
-                <!-- Needed by jersey -->
+                <!-- Needed by jaxb-api, and possibly guice -->
+                <!-- TODO Vespa 9: stop exporting/providing and move to parent? -->
                 <groupId>com.sun.activation</groupId>
                 <artifactId>javax.activation</artifactId>
                 <version>1.2.0</version>
@@ -202,61 +184,6 @@
                 <artifactId>jetty-util</artifactId>
                 <version>${jetty.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2.external</groupId>
-                <artifactId>aopalliance-repackaged</artifactId>
-                <version>${hk2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2.external</groupId>
-                <artifactId>javax.inject</artifactId>
-                <version>${hk2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-api</artifactId>
-                <version>${hk2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-locator</artifactId>
-                <version>${hk2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>hk2-utils</artifactId>
-                <version>${hk2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.hk2</groupId>
-                <artifactId>osgi-resource-locator</artifactId>
-                <version>${hk2.osgi-resource-locator.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
-                <artifactId>jersey-guava</artifactId>
-                <version>${jersey2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-client</artifactId>
-                <version>${jersey2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-common</artifactId>
-                <version>${jersey2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>${jersey2.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.javassist</groupId>
-                <artifactId>javassist</artifactId>
-                <version>${javassist.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
@@ -368,8 +295,11 @@
         <felix.log.version>1.0.1</felix.log.version>
         <guava.version>27.1-jre</guava.version>
         <guice.version>4.2.3</guice.version>
+        <jackson2.version>2.13.3</jackson2.version>
+        <jackson-databind.version>${jackson2.version}</jackson-databind.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
         <jaxb.version>2.3.0</jaxb.version>
         <jetty.version>9.4.46.v20220331</jetty.version>
         <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version>
@@ -378,19 +308,6 @@
         <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom -->
         <xml-apis.version>1.4.01</xml-apis.version>
 
-        <!-- These must be kept in sync with version used by current jersey2.version. -->
-        <!-- MUST be updated each time jersey2 is upgraded! -->
-        <!-- Check versions in the properties section of the pom for org/glassfish/jersey/project/ -->
-        <!-- and then verify  by doing: ' ls -l vespa/vespa_jersey2/target/dependency' -->
-        <hk2.version>2.5.0-b32</hk2.version>
-        <hk2.osgi-resource-locator.version>1.0.1</hk2.osgi-resource-locator.version>
-        <jackson2.version>2.13.3</jackson2.version>
-        <jackson-databind.version>${jackson2.version}</jackson-databind.version>
-        <javassist.version>3.20.0-GA</javassist.version>
-        <javax.validation-api.version>1.1.0.Final</javax.validation-api.version>
-        <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
-        <jersey2.version>2.25</jersey2.version>
-
         <!-- Not a dependency. Only included to allow the versions-maven-plugin to check for updates of itself  -->
         <versions-maven-plugin.version>2.8.1</versions-maven-plugin.version>
     </properties>
-- 
cgit v1.2.3