diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-11-02 20:32:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 20:32:13 +0100 |
| commit | 04a3bd4d2176aff7544a9135fb1ccb6e25d70252 (patch) | |
| tree | 0e381e90131fbb79e511a3ebffdcf821b3c48cba | |
| parent | a132de97ff01f9496a276eba334bc1c17c941d77 (diff) | |
| parent | 36587c72f7e715a63bef8a9964610588acf5f2eb (diff) | |
Merge pull request #7555 from vespa-engine/jvenstad/separate-test-jar-to-ease-scanning
Separate jar with tests to scan to avoid Surefire breakdown
| -rw-r--r-- | tenant-base/pom.xml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 51d830f0e7d..a29302f9ab4 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -78,12 +78,13 @@ <profiles> <profile> - <!-- Build *-fat-test.jar file that includes all classes and resources - that are part of the class path during test and put it inside a zip: + <!-- Build *-fat-test.jar file that includes all non-test classes and resources + that are part of the class path during test and and test.jar that includes + all test classes and resources, and put it inside a zip: 1. application classes and resources 2. test classes and resources 3. classes and resources in all dependencies of both (1) and (2) - 4. copy the fat-test-jar to application-test/artifacts directory + 4. copy the fat-test-jar and test-jar to application-test/artifacts directory 5. zip application-test --> <id>fat-test-application</id> <build> @@ -154,10 +155,6 @@ <resource> <directory>target/classes</directory> </resource> - <!-- test classes and resources, see 2. above --> - <resource> - <directory>target/test-classes</directory> - </resource> </resources> </configuration> </execution> @@ -169,6 +166,7 @@ <version>3.1.0</version> <executions> <execution> + <id>fat-test-jar</id> <phase>package</phase> <goals> <goal>jar</goal> @@ -178,6 +176,13 @@ <classifier>fat-test</classifier> </configuration> </execution> + <execution> + <id>test-jar</id> + <phase>package</phase> + <goals> + <goal>test-jar</goal> + </goals> + </execution> </executions> </plugin> <plugin> @@ -196,6 +201,10 @@ <copy file="target/${project.artifactId}-fat-test.jar" todir="target/application-test/artifacts/" /> + <!-- copy slim test-jar to application-test artifacts directory, see 4. above --> + <copy file="target/${project.artifactId}-tests.jar" + todir="target/application-test/artifacts/" /> + <!-- zip application-test, see 5. above --> <zip destfile="target/application-test.zip" basedir="target/application-test/" /> |