From 3831b0715c0209a0d1db5378c76e097020221852 Mon Sep 17 00:00:00 2001
From: Morten Tokle <mortent@verizonmedia.com>
Date: Tue, 14 Dec 2021 12:31:32 +0100
Subject: Fix scopes for test bundle

---
 cloud-tenant-base-dependencies-enforcer/pom.xml                    | 2 ++
 hosted-tenant-base/pom.xml                                         | 2 ++
 tenant-cd-api/pom.xml                                              | 6 ++++++
 tenant-cd-api/src/main/java/ai/vespa/feed/client/package-info.java | 5 +++++
 tenant-cd-commons/pom.xml                                          | 6 ++++++
 5 files changed, 21 insertions(+)
 create mode 100644 tenant-cd-api/src/main/java/ai/vespa/feed/client/package-info.java

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index d2ebb7ba9eb..476ea52777e 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -202,6 +202,8 @@
                                         <include>com.yahoo.vespa:tenant-cd-api:*:jar:test</include>
                                         <include>com.yahoo.vespa:tenant-cd-commons:*:jar:test</include>
                                         <include>com.yahoo.vespa:vespa-athenz:*:jar:test</include>
+                                        <include>com.yahoo.vespa:vespa-feed-client:*:jar:test</include>
+                                        <include>com.yahoo.vespa:vespa-feed-client-api:*:jar:test</include>
                                         <include>com.yahoo.vespa:vespa_jersey2:*:pom:test</include>
                                         <include>com.yahoo.vespa:vespaclient-core:*:jar:test</include>
                                         <include>com.yahoo.vespa:vsm:*:jar:test</include>
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index 0dc7aee7cd4..e7c364cb7de 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -200,6 +200,8 @@
                                 org.junit.jupiter:junit-jupiter-api:provided,
                                 org.junit.jupiter:junit-jupiter-engine:test,
                                 org.junit.vintage:junit-vintage-engine:test,
+                                com.yahoo.vespa:vespa-feed-client:runtime, <!-- prevent effective compile scope of vespa-feed-client in test bundle -->
+                                com.yahoo.vespa:vespa-feed-client-api:provided,
                                 com.yahoo.vespa:tenant-cd-api:provided
                             </testBundleScopeOverrides>
                         </configuration>
diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml
index 5ac52748152..60d862a8844 100644
--- a/tenant-cd-api/pom.xml
+++ b/tenant-cd-api/pom.xml
@@ -58,6 +58,12 @@
             <version>${hosted-tenant-base-junit-version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>vespa-feed-client-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/tenant-cd-api/src/main/java/ai/vespa/feed/client/package-info.java b/tenant-cd-api/src/main/java/ai/vespa/feed/client/package-info.java
new file mode 100644
index 00000000000..3871dc1fa3d
--- /dev/null
+++ b/tenant-cd-api/src/main/java/ai/vespa/feed/client/package-info.java
@@ -0,0 +1,5 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+@ExportPackage
+package ai.vespa.feed.client;
+
+import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
diff --git a/tenant-cd-commons/pom.xml b/tenant-cd-commons/pom.xml
index 4c81142aa2d..0ada43bca0b 100644
--- a/tenant-cd-commons/pom.xml
+++ b/tenant-cd-commons/pom.xml
@@ -46,6 +46,12 @@
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>vespa-feed-client</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.yahoo.vespa</groupId>
+                    <artifactId>vespa-feed-client-api</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>compile</scope>
         </dependency>
     </dependencies>
-- 
cgit v1.2.3