summaryrefslogtreecommitdiffstats
path: root/vespa-testrunner-components
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-11-09 15:15:44 +0100
committerGitHub <noreply@github.com>2020-11-09 15:15:44 +0100
commit1a05447b016134432df821daef53568e28df2c45 (patch)
tree97bbd17a4b5f9b06311249b373d4481c6db354b3 /vespa-testrunner-components
parent14a69660ed619b5ea5a3c483f9e90d72d3a5e17d (diff)
Revert "Revert "Junit 4.13 and juptier 5.7.0" (#15054)"
This reverts commit eee4f01559ec6be4bd1bc4b8e065600eb8533ebf.
Diffstat (limited to 'vespa-testrunner-components')
-rw-r--r--vespa-testrunner-components/src/main/java/com/yahoo/vespa/hosted/testrunner/PomXmlGenerator.java2
-rw-r--r--vespa-testrunner-components/src/test/resources/pom.xml_system_tests2
2 files changed, 2 insertions, 2 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 389c4e66019..7782b7d58c2 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.6.2</junit_version>\n" +
+ " <junit_version>5.7.0</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 685636fa3ca..269bbd2a3c3 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.6.2</junit_version>
+ <junit_version>5.7.0</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>