From c23936c08384e74f0c2fa7f364396eb65d570d0c Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Fri, 2 Apr 2021 23:44:59 +0200
Subject: Package component and container-core as jar, not container-plugin.

- component is now embedded in container-disc, and container-core
  always was.
---
 component/pom.xml      | 7 +------
 container-core/pom.xml | 7 +------
 container-disc/pom.xml | 1 -
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/component/pom.xml b/component/pom.xml
index 75b07643c7e..4d7b716445a 100755
--- a/component/pom.xml
+++ b/component/pom.xml
@@ -12,7 +12,7 @@
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
   <artifactId>component</artifactId>
-  <packaging>container-plugin</packaging>
+  <packaging>jar</packaging>
   <version>7-SNAPSHOT</version>
   <dependencies>
     <dependency>
@@ -58,11 +58,6 @@
   </dependencies>
   <build>
     <plugins>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
diff --git a/container-core/pom.xml b/container-core/pom.xml
index 3fec3cb6595..bc40984d934 100644
--- a/container-core/pom.xml
+++ b/container-core/pom.xml
@@ -13,7 +13,7 @@
   </parent>
   <artifactId>container-core</artifactId>
   <version>7-SNAPSHOT</version>
-  <packaging>container-plugin</packaging>
+  <packaging>jar</packaging>
   <dependencies>
 
     <!-- COMPILE scope -->
@@ -335,11 +335,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>bundle-plugin</artifactId>
-        <extensions>true</extensions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
diff --git a/container-disc/pom.xml b/container-disc/pom.xml
index a78657b7f09..45ee87b4b3f 100644
--- a/container-disc/pom.xml
+++ b/container-disc/pom.xml
@@ -56,7 +56,6 @@
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>component</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-- 
cgit v1.2.3