aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcomponent/pom.xml7
-rw-r--r--container-core/pom.xml7
-rw-r--r--container-disc/pom.xml1
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>
@@ -59,11 +59,6 @@
<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>
<executions>
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 -->
@@ -336,11 +336,6 @@
</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>
<configuration>
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>