diff options
author | gjoranv <gv@verizonmedia.com> | 2019-10-22 15:00:57 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-10-22 15:00:57 +0200 |
commit | 7fb6576a7284be594386ac438caad8d34569ad53 (patch) | |
tree | deebeb4e77327f6c9176fae18819b8c4e849bdc5 /bundle-plugin-test | |
parent | 2a9a2c8ef869f8999661e15874f654cf044e0f33 (diff) |
Avoid creating unnecessary jar for test-bundles root.
Diffstat (limited to 'bundle-plugin-test')
-rw-r--r-- | bundle-plugin-test/test-bundles/pom.xml | 60 |
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> |