From ed1a7fcd7a71bf837d13f533aaeb6da554690b02 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Fri, 24 Aug 2018 14:09:25 +0200
Subject: Configure bundle-plugin to attach bundle artifact.

---
 controller-server/pom.xml | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'controller-server/pom.xml')

diff --git a/controller-server/pom.xml b/controller-server/pom.xml
index 06afd86684b..d9a25520985 100644
--- a/controller-server/pom.xml
+++ b/controller-server/pom.xml
@@ -216,6 +216,8 @@
                 <groupId>com.yahoo.vespa</groupId>
                 <artifactId>bundle-plugin</artifactId>
                 <configuration>
+                    <attachBundleToArtifact>true</attachBundleToArtifact>
+                    <bundleClassifierName>deploy</bundleClassifierName>
                     <useCommonAssemblyIds>false</useCommonAssemblyIds>
                     <WebInfUrl>/WEB-INF/web.xml</WebInfUrl>
                 </configuration>
@@ -235,29 +237,6 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/${project.artifactId}-deploy.jar</file>
-                                    <type>jar</type>
-                                    <classifier>deploy</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
-- 
cgit v1.2.3