diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-06-07 16:16:01 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-06-07 16:16:01 +0200 |
| commit | 65937b2191aad18db17403cdbf0b94db7aac7cc7 (patch) | |
| tree | 172777c48fcd2ae52ea1b9d70b13135e5a92c269 /tenant-base | |
| parent | 7f0d865ff06f94f4f30a92608bffbedb9dbdcb39 (diff) | |
Restructure tenant-base/pom.xml to reuse surefire configuration
Diffstat (limited to 'tenant-base')
| -rw-r--r-- | tenant-base/pom.xml | 119 |
1 files changed, 34 insertions, 85 deletions
diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 78286472b76..9c3a28964ed 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -41,7 +41,6 @@ <dependencyManagement> <dependencies> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dependency-versions</artifactId> @@ -49,7 +48,6 @@ <type>pom</type> <scope>import</scope> </dependency> - </dependencies> </dependencyManagement> @@ -224,29 +222,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire_version}</version> <configuration> <groups>ai.vespa.hosted.cd.SystemTest</groups> - <excludedGroups /> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> - <redirectTestOutputToFile>false</redirectTestOutputToFile> - <trimStackTrace>false</trimStackTrace> - <systemPropertyVariables> - <application>${application}</application> - <tenant>${tenant}</tenant> - <instance>${instance}</instance> - <endpoint>${endpoint}</endpoint> - <privateKeyFile>${privateKeyFile}</privateKeyFile> - <certificateFile>${certificateFile}</certificateFile> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${surefire_version}</version> - <configuration> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> + <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> </configuration> </plugin> </plugins> @@ -260,29 +238,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire_version}</version> <configuration> <groups>ai.vespa.hosted.cd.StagingTest</groups> - <excludedGroups /> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> - <redirectTestOutputToFile>false</redirectTestOutputToFile> - <trimStackTrace>false</trimStackTrace> - <systemPropertyVariables> - <application>${application}</application> - <tenant>${tenant}</tenant> - <instance>${instance}</instance> - <endpoint>${endpoint}</endpoint> - <privateKeyFile>${privateKeyFile}</privateKeyFile> - <certificateFile>${certificateFile}</certificateFile> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${surefire_version}</version> - <configuration> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> + <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> </configuration> </plugin> </plugins> @@ -296,29 +254,9 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire_version}</version> <configuration> <groups>ai.vespa.hosted.cd.ProductionTest</groups> - <excludedGroups /> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> - <redirectTestOutputToFile>false</redirectTestOutputToFile> - <trimStackTrace>false</trimStackTrace> - <systemPropertyVariables> - <application>${application}</application> - <tenant>${tenant}</tenant> - <instance>${instance}</instance> - <endpoint>${endpoint}</endpoint> - <privateKeyFile>${privateKeyFile}</privateKeyFile> - <certificateFile>${certificateFile}</certificateFile> - </systemPropertyVariables> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${surefire_version}</version> - <configuration> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> + <excludedGroups>ai.vespa.hosted.cd.EmptyGroup</excludedGroups> </configuration> </plugin> </plugins> @@ -328,8 +266,38 @@ <build> <finalName>${project.artifactId}</finalName> - <plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire_version}</version> + <configuration> + <reportsDirectory>${env.TEST_DIR}</reportsDirectory> + <redirectTestOutputToFile>false</redirectTestOutputToFile> + <trimStackTrace>false</trimStackTrace> + <systemPropertyVariables> + <application>${application}</application> + <tenant>${tenant}</tenant> + <instance>${instance}</instance> + <endpoint>${endpoint}</endpoint> + <privateKeyFile>${privateKeyFile}</privateKeyFile> + <certificateFile>${certificateFile}</certificateFile> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${surefire_version}</version> + <configuration> + <reportsDirectory>${env.TEST_DIR}</reportsDirectory> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> @@ -393,17 +361,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire_version}</version> <configuration> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> - <systemPropertyVariables> - <application>${application}</application> - <tenant>${tenant}</tenant> - <instance>${instance}</instance> - <endpoint>${endpoint}</endpoint> - <privateKeyFile>${privateKeyFile}</privateKeyFile> - <certificateFile>${certificateFile}</certificateFile> - </systemPropertyVariables> <excludedGroups> ai.vespa.hosted.cd.SystemTest, ai.vespa.hosted.cd.StagingTest, @@ -411,15 +369,6 @@ </excludedGroups> </configuration> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${surefire_version}</version> - <configuration> - <reportsDirectory>${env.TEST_DIR}</reportsDirectory> - </configuration> - </plugin> </plugins> </build> </project> |