Use our bundle-plugin for one of the integration test bundles.

2 files changed, 9 insertions, 8 deletions

diff --git a/jdisc_core_test/test_bundles/cert-b/pom.xml b/jdisc_core_test/test_bundles/cert-b/pom.xml
index fb2a18ebc97..c634dda581a 100644
--- a/jdisc_core_test/test_bundles/cert-b/pom.xml
+++ b/jdisc_core_test/test_bundles/cert-b/pom.xml
@@ -12,20 +12,17 @@
     </parent>
     <artifactId>cert-b</artifactId>
     <version>6-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>container-plugin</packaging>
     <name>${project.artifactId}</name>
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
+                <groupId>com.yahoo.vespa</groupId>
+                <artifactId>bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <instructions>
-                        <Export-Package>
-                            com.yahoo.jdisc.bundle.b
-                        </Export-Package>
-                    </instructions>
+                    <!-- The Vespa bundle-plugin doesn't include groupId. TODO Vespa 7: remove if that is fixed. -->
+                    <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/jdisc_core_test/test_bundles/cert-b/src/main/java/com/yahoo/jdisc/bundle/b/package-info.java b/jdisc_core_test/test_bundles/cert-b/src/main/java/com/yahoo/jdisc/bundle/b/package-info.java
new file mode 100644
index 00000000000..2773287114b
--- /dev/null
+++ b/jdisc_core_test/test_bundles/cert-b/src/main/java/com/yahoo/jdisc/bundle/b/package-info.java
@@ -0,0 +1,4 @@
+@ExportPackage
+package com.yahoo.jdisc.bundle.b;
+
+import com.yahoo.osgi.annotation.ExportPackage;