summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-01 12:18:59 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-07-01 12:19:06 +0200
commit65e9461d1c271cce61248210797a5bc2ffdb1694 (patch)
treeef40f1ecd6e175b7b3d127364cbdff04d1591f60
parent5108f48b4994422924b14fc4a435e33733c56756 (diff)
Generate test descriptor with 'generateTestDescriptor' goal
Move vespa-maven-plugin above vespa-application-maven-plugin to ensure test descriptor goal is executed before goals from vespa-application-maven-plugin.
-rw-r--r--hosted-tenant-base/pom.xml15
1 files changed, 12 insertions, 3 deletions
diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml
index b565e1004e9..faf8b4295e7 100644
--- a/hosted-tenant-base/pom.xml
+++ b/hosted-tenant-base/pom.xml
@@ -200,12 +200,14 @@
<plugin>
<groupId>com.yahoo.vespa</groupId>
- <artifactId>vespa-application-maven-plugin</artifactId>
+ <artifactId>vespa-maven-plugin</artifactId>
<version>${vespaversion}</version>
<executions>
<execution>
+ <id>generate-test-descriptor</id>
+ <phase>prepare-package</phase>
<goals>
- <goal>packageApplication</goal>
+ <goal>generateTestDescriptor</goal>
</goals>
</execution>
</executions>
@@ -213,8 +215,15 @@
<plugin>
<groupId>com.yahoo.vespa</groupId>
- <artifactId>vespa-maven-plugin</artifactId>
+ <artifactId>vespa-application-maven-plugin</artifactId>
<version>${vespaversion}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>packageApplication</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>