From e3de588e7689b3fd0703b45dc665ee3f913b42cc Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Fri, 19 Feb 2021 19:12:01 +0100
Subject: Use explicit dependencies instead of 'provided-dependencies'

.. while keeping all necessary provided deps to get all imports
   needed by the compile scoped deps in each module.
---
 container-jersey2/pom.xml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'container-jersey2')

diff --git a/container-jersey2/pom.xml b/container-jersey2/pom.xml
index 231e9dd4a0e..e94e2a46bba 100644
--- a/container-jersey2/pom.xml
+++ b/container-jersey2/pom.xml
@@ -15,49 +15,57 @@
   <version>7-SNAPSHOT</version>
   <packaging>container-plugin</packaging>
   <dependencies>
+
+    <!-- COMPILE scope -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
     </dependency>
+
+
+    <!-- PROVIDED scope -->
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespa_jersey2</artifactId>
+      <artifactId>component</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>provided-dependencies</artifactId>
+      <artifactId>container-di</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>component</artifactId>
+      <artifactId>jdisc_core</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
-      <artifactId>container-disc</artifactId>
+      <artifactId>vespa_jersey2</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
+      <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <!-- TEST scope -->
     <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>
-- 
cgit v1.2.3