diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2020-08-03 16:33:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 16:33:35 +0200 |
| commit | af7cdb83dbb987499b4e346d79b96e651854276a (patch) | |
| tree | 9ded1d8a453bfb35cbfeb103b04916750b9bc01b | |
| parent | 93e25aa600eb299be051a9a48523f47c86dc0246 (diff) | |
| parent | d6c135abb6255d25b703ef162aa369bcd8b97981 (diff) | |
Merge pull request #13967 from vespa-engine/mortent/sync-junit-jupiter-tenant-base
Upgrade junit version to match other base modules
4 files changed, 4 insertions, 4 deletions
diff --git a/parent/pom.xml b/parent/pom.xml index e0d87de14f2..c2fab3da5d9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -768,7 +768,7 @@ <curator.version>2.13.0</curator.version> <jna.version>4.5.2</jna.version> <commons.math3.version>3.6.1</commons.math3.version> - <junit.version>5.4.2</junit.version> + <junit.version>5.6.2</junit.version> <maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version> <maven-bundle-plugin.version>3.5.0</maven-bundle-plugin.version> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> diff --git a/tenant-base/pom.xml b/tenant-base/pom.xml index 490dcf6371b..addaedec7df 100644 --- a/tenant-base/pom.xml +++ b/tenant-base/pom.xml @@ -37,7 +37,7 @@ <target_jdk_version>11</target_jdk_version> <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version> <maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version> - <junit.version>5.4.2</junit.version> + <junit.version>5.6.2</junit.version> <!-- Keep in sync with hosted-tenant-base and tenant-cd until all direct use is removed --> <endpoint>https://api.vespa-external.aws.oath.cloud:4443</endpoint> <test.categories>!integration</test.categories> </properties> 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 dd424de5471..389c4e66019 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 @@ -38,7 +38,7 @@ public class PomXmlGenerator { " <version>1.0.0</version>\n" + "\n" + " <properties>\n" + - " <junit_version>5.4.2</junit_version>\n" + + " <junit_version>5.6.2</junit_version>\n" + " <surefire_version>2.22.0</surefire_version>\n" + "%PROPERTIES%" + " </properties>\n" + 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 7c986560c17..685636fa3ca 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> - <junit_version>5.4.2</junit_version> + <junit_version>5.6.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> |