diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-06-21 14:39:10 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-06-21 14:39:10 +0200 |
| commit | 5657f27ee72fc1d3d11163f3b00888c8042cfe99 (patch) | |
| tree | 58c7a10a5a6e35733d0a9b6bfbb41f7a1fd65ef0 /vespa-testrunner-components | |
| parent | 5e2e37ad9da4f521a209856fc20cbc42de0ae633 (diff) | |
Support JUnit 5 in tester applications
Diffstat (limited to 'vespa-testrunner-components')
| -rw-r--r-- | vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java | 14 | ||||
| -rw-r--r-- | vespa-testrunner-components/src/test/resources/pom.xml_system_tests | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java index 221ff2bc9a4..4ebabe63c1d 100644 --- a/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java +++ b/vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java @@ -36,16 +36,22 @@ public class PomXmlGenerator { " <version>1.0.0</version>\n" + "\n" + " <properties>\n" + - " <maven_version>4.12</maven_version>\n" + + " <junit_version>5.4.2</junit_version>\n" + " <surefire_version>2.22.0</surefire_version>\n" + "%PROPERTIES%" + " </properties>\n" + "\n" + " <dependencies>\n" + " <dependency>\n" + - " <groupId>junit</groupId>\n" + - " <artifactId>junit</artifactId>\n" + - " <version>${maven_version}</version>\n" + + " <groupId>org.junit.vintage</groupId>\n" + + " <artifactId>junit-vintage-engine</artifactId>\n" + + " <version>${junit_version}</version>\n" + + " <scope>test</scope>\n" + + " </dependency>\n" + + " <dependency>\n" + + " <groupId>org.junit.jupiter</groupId>\n" + + " <artifactId>junit-jupiter-engine</artifactId>\n" + + " <version>${junit_version}</version>\n" + " <scope>test</scope>\n" + " </dependency>\n" + "%DEPENDENCIES%" + diff --git a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests index 86c36afd636..263bd27a4f3 100644 --- a/vespa-testrunner-components/src/test/resources/pom.xml_system_tests +++ b/vespa-testrunner-components/src/test/resources/pom.xml_system_tests @@ -6,7 +6,7 @@ <version>1.0.0</version> <properties> - <maven_version>4.12</maven_version> + <junit_version>5.4.2</junit_version> <surefire_version>2.22.0</surefire_version> <my-comp.jar.path>components/my-comp.jar</my-comp.jar.path> <main.jar.path>main.jar</main.jar.path> @@ -14,9 +14,15 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${maven_version}</version> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit_version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit_version}</version> <scope>test</scope> </dependency> <dependency> |