Ensure transitive dependencies of vespajlib are present on test classpath

Some modules misuse container-dev as a compile/test dependency or have container-test missing as test dependency.
Depend on container-test where it does not create a cycle.
Otherwise depend directly on vespajlib without altering scope of existing transitive vespajlib dependency.

10 files changed, 61 insertions, 0 deletions

diff --git a/application/pom.xml b/application/pom.xml
index cd27b53f557..01802c7a712 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -54,6 +54,12 @@
       <artifactId>container-search-gui</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespajlib</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <!-- Because these are provided in jdisc_http_service and just preinstalled: -->
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml
index e5f1d7737a1..0cc3f04a57b 100644
--- a/athenz-identity-provider-service/pom.xml
+++ b/athenz-identity-provider-service/pom.xml
@@ -134,6 +134,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/clustercontroller-reindexer/pom.xml b/clustercontroller-reindexer/pom.xml
index 172bff6fdb4..e0577c438b5 100644
--- a/clustercontroller-reindexer/pom.xml
+++ b/clustercontroller-reindexer/pom.xml
@@ -63,6 +63,12 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index ea3bbcf1e49..6909a8c4d47 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -203,6 +203,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/documentgen-test/pom.xml b/documentgen-test/pom.xml
index 52986be7465..72fbe1682a7 100644
--- a/documentgen-test/pom.xml
+++ b/documentgen-test/pom.xml
@@ -27,6 +27,12 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespajlib</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <!-- TODO: Excluded from container-dev. Remove when deps are explicitly listed.  -->
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>linguistics</artifactId>
diff --git a/node-admin/pom.xml b/node-admin/pom.xml
index d636e2544c2..52873501744 100644
--- a/node-admin/pom.xml
+++ b/node-admin/pom.xml
@@ -143,6 +143,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/node-repository/pom.xml b/node-repository/pom.xml
index beb6821290e..fb46735ec73 100644
--- a/node-repository/pom.xml
+++ b/node-repository/pom.xml
@@ -130,6 +130,12 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>container-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml
index 0a756d5913f..11d0406fcc5 100644
--- a/standalone-container/pom.xml
+++ b/standalone-container/pom.xml
@@ -66,6 +66,12 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespajlib</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/vespa-documentgen-plugin/pom.xml b/vespa-documentgen-plugin/pom.xml
index d290f005b5e..7aee1e4265a 100644
--- a/vespa-documentgen-plugin/pom.xml
+++ b/vespa-documentgen-plugin/pom.xml
@@ -47,6 +47,12 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>vespajlib</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>3.5.0</version>
diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml
index 8254c208588..834c3d7c988 100644
--- a/vespaclient-container-plugin/pom.xml
+++ b/vespaclient-container-plugin/pom.xml
@@ -78,6 +78,12 @@
         <version>${project.version}</version>
         <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>container-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>