aboutsummaryrefslogtreecommitdiffstats
path: root/bundle-plugin-test
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2019-10-22 15:00:57 +0200
committergjoranv <gv@verizonmedia.com>2019-10-23 12:26:58 +0200
commitf5115c2bfcf97f90fbc9db1d04f6eb92ccea4e75 (patch)
tree15e60bd4c92da808a48008ae60a37eb19d371740 /bundle-plugin-test
parent753ffc8bcb3d3da278621b1edf7459e2c710a0c1 (diff)
Avoid creating unnecessary jar for test-bundles root.
Diffstat (limited to 'bundle-plugin-test')
-rw-r--r--bundle-plugin-test/test-bundles/pom.xml60
1 files changed, 32 insertions, 28 deletions
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>