Use custom test bundle also for testing non-public api usage.

4 files changed, 8 insertions, 20 deletions

diff --git a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java
index dbf1c893fa8..9111cd00f82 100644
--- a/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java
+++ b/bundle-plugin-test/integration-test/src/test/java/com/yahoo/container/plugin/NonPublicApiDetectionTest.java
@@ -39,8 +39,8 @@ public class NonPublicApiDetectionTest {
         var usedNonPublicApi = Arrays.stream(nonPublicApiAttribute.split(",")).collect(Collectors.toSet());
 
         assertEquals(2, usedNonPublicApi.size());
-        assertTrue(usedNonPublicApi.contains("ai.vespa.http"));
-        assertTrue(usedNonPublicApi.contains("com.yahoo.io"));
+        assertTrue(usedNonPublicApi.contains("ai.vespa.lib.non_public"));
+        assertTrue(usedNonPublicApi.contains("com.yahoo.lib.non_public"));
     }
 
 }
diff --git a/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/com/yahoo/lib/non_pubilc/package-info.java b/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/com/yahoo/lib/non_pubilc/package-info.java
deleted file mode 100644
index a3368af200c..00000000000
--- a/bundle-plugin-test/test-bundles/export-packages-lib/src/main/java/com/yahoo/lib/non_pubilc/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.lib.non_public;
-
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml b/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml
index 5386346b8f7..2a621fd97c2 100644
--- a/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml
+++ b/bundle-plugin-test/test-bundles/non-public-api-usage/pom.xml
@@ -17,14 +17,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>defaults</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>vespajlib</artifactId>
+      <groupId>com.yahoo.vespa.bundle-plugin</groupId>
+      <artifactId>export-packages-lib</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/bundle-plugin-test/test-bundles/non-public-api-usage/src/main/java/com/yahoo/test/UsingBothPublicApiAndNonPublicApiPackages.java b/bundle-plugin-test/test-bundles/non-public-api-usage/src/main/java/com/yahoo/test/UsingBothPublicApiAndNonPublicApiPackages.java
index f2c64661ad6..7bea3252ea5 100644
--- a/bundle-plugin-test/test-bundles/non-public-api-usage/src/main/java/com/yahoo/test/UsingBothPublicApiAndNonPublicApiPackages.java
+++ b/bundle-plugin-test/test-bundles/non-public-api-usage/src/main/java/com/yahoo/test/UsingBothPublicApiAndNonPublicApiPackages.java
@@ -3,13 +3,12 @@ package com.yahoo.test;
 
 public class UsingBothPublicApiAndNonPublicApiPackages {
 
-    com.yahoo.vespa.defaults.Defaults publicFromDefaults = null;
+    ai.vespa.lib.non_public.Foo    non_public_ai_vespa = null;
 
-    com.yahoo.text.BooleanParser publicFromVespajlib = null;
+    ai.vespa.lib.public_api.Foo    public_ai_vespa = null;
 
+    com.yahoo.lib.non_public.Foo   non_public_com_yahoo = null;
 
-    ai.vespa.http.DomainName nonPublic1 = null;
-
-    com.yahoo.io.ByteWriter nonPublic2 = null;
+    com.yahoo.lib.public_api.Foo   public_com_yahoo = null;
 
 }