From f5115c2bfcf97f90fbc9db1d04f6eb92ccea4e75 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Tue, 22 Oct 2019 15:00:57 +0200
Subject: Avoid creating unnecessary jar for test-bundles root.

---
 bundle-plugin-test/test-bundles/pom.xml | 60 ++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 28 deletions(-)

(limited to 'bundle-plugin-test')

diff --git a/bundle-plugin-test/test-bundles/pom.xml b/bundle-plugin-test/test-bundles/pom.xml
index 285efd6183e..712ccb5542e 100644
--- a/bundle-plugin-test/test-bundles/pom.xml
+++ b/bundle-plugin-test/test-bundles/pom.xml
@@ -20,35 +20,39 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
-            <plugin>
-                <!-- Trick to package bundles before test phase to allow running 'mvn test' -->
-                <groupId>com.yahoo.vespa</groupId>
-                <artifactId>bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <id>generate-classpath-mappings</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>generate-bundle-classpath-mappings</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>package-test-bundles</id>
-                        <!-- Must be done after generating classpath-mappings and copying it in the 'main' bundle. -->
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>generate-osgi-manifest</goal>
-                            <goal>assemble-container-plugin</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- The integration-test module should use the bundle jars instead of the ordinary artifacts. -->
-                    <AttachBundle>true</AttachBundle>
-                </configuration>
-            </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <!-- Trick to package bundles before test phase to allow running 'mvn test' -->
+                    <groupId>com.yahoo.vespa</groupId>
+                    <artifactId>bundle-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <executions>
+                        <execution>
+                            <id>generate-classpath-mappings</id>
+                            <phase>generate-test-sources</phase>
+                            <goals>
+                                <goal>generate-bundle-classpath-mappings</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>package-test-bundles</id>
+                            <!-- Must be done after generating classpath-mappings and copying it in the 'main' bundle. -->
+                            <phase>test-compile</phase>
+                            <goals>
+                                <goal>generate-osgi-manifest</goal>
+                                <goal>assemble-container-plugin</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <!-- Make the integration-test module use the bundle jars instead of the ordinary artifacts. -->
+                        <AttachBundle>true</AttachBundle>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
     <modules>
         <module>artifact-version-for-exports</module>
-- 
cgit v1.2.3