diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-10-21 16:31:58 +0200 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-10-22 14:31:37 +0200 |
| commit | dbfa0726b21b589d48410990a675a578f8ae7535 (patch) | |
| tree | e7b321923621d3208ee4fc95b79ae073c13dc6b8 /bundle-plugin-test/test-bundles | |
| parent | 50f898c1864dada0e8b8f96eb742947fafe4dd06 (diff) | |
Use surefire instead of failsafe plugin.
- No need to use integration tests after test bundles have been
moved to separate modules.
Diffstat (limited to 'bundle-plugin-test/test-bundles')
| -rw-r--r-- | bundle-plugin-test/test-bundles/main/pom.xml | 5 | ||||
| -rw-r--r-- | bundle-plugin-test/test-bundles/pom.xml | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/bundle-plugin-test/test-bundles/main/pom.xml b/bundle-plugin-test/test-bundles/main/pom.xml index 90d575c2a0b..c9c9ea270eb 100644 --- a/bundle-plugin-test/test-bundles/main/pom.xml +++ b/bundle-plugin-test/test-bundles/main/pom.xml @@ -52,8 +52,9 @@ <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>copy-resources</id> - <phase>prepare-package</phase> + <id>copy-bundle-classpath-mappings-from-test-to-main</id> + <!-- NOTE: Must be done after generating classpath-mappings and before assembling the bundle (see the test-bundles pom) --> + <phase>process-test-sources</phase> <goals> <goal>copy-resources</goal> </goals> diff --git a/bundle-plugin-test/test-bundles/pom.xml b/bundle-plugin-test/test-bundles/pom.xml index b18c0b9ba3f..285efd6183e 100644 --- a/bundle-plugin-test/test-bundles/pom.xml +++ b/bundle-plugin-test/test-bundles/pom.xml @@ -27,8 +27,16 @@ <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> - <phase>process-classes</phase> + <!-- 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> |