53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
|
From a671eac4ae355b1d45907d8df71dfdd294906651 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Raiskup <praiskup@redhat.com>
|
||
|
|
Date: Sun, 17 Jun 2018 13:52:09 +0200
|
||
|
|
Subject: [PATCH] Revert "started migration to Junit 5"
|
||
|
|
|
||
|
|
This reverts upstream commit 6ca437135e19c7506286458416485b0d6abcbf1c.
|
||
|
|
---
|
||
|
|
pom.xml | 14 +++-----------
|
||
|
|
1 file changed, 3 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pom.xml b/pom.xml
|
||
|
|
index b532637..934b9d9 100644
|
||
|
|
--- a/pom.xml
|
||
|
|
+++ b/pom.xml
|
||
|
|
@@ -18,7 +18,6 @@
|
||
|
|
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
|
||
|
|
<maven.home>${user.home}/SDKs/apache-maven-3.5.0</maven.home>
|
||
|
|
<min.maven.api>3.0</min.maven.api>
|
||
|
|
- <junit.version>5.2.0</junit.version>
|
||
|
|
</properties>
|
||
|
|
|
||
|
|
<issueManagement>
|
||
|
|
@@ -237,9 +236,9 @@
|
||
|
|
<scope>compile</scope>
|
||
|
|
</dependency>
|
||
|
|
<dependency>
|
||
|
|
- <groupId>org.junit.vintage</groupId>
|
||
|
|
- <artifactId>junit-vintage-engine</artifactId>
|
||
|
|
- <version>${junit.version}</version>
|
||
|
|
+ <groupId>junit</groupId>
|
||
|
|
+ <artifactId>junit</artifactId>
|
||
|
|
+ <version>4.12</version>
|
||
|
|
<scope>test</scope>
|
||
|
|
</dependency>
|
||
|
|
<dependency>
|
||
|
|
@@ -464,13 +463,6 @@
|
||
|
|
<test.folder>${project.build.testOutputDirectory}</test.folder>
|
||
|
|
</systemPropertyVariables>
|
||
|
|
</configuration>
|
||
|
|
- <dependencies>
|
||
|
|
- <dependency>
|
||
|
|
- <groupId>org.junit.platform</groupId>
|
||
|
|
- <artifactId>junit-platform-surefire-provider</artifactId>
|
||
|
|
- <version>1.2.0</version>
|
||
|
|
- </dependency>
|
||
|
|
- </dependencies>
|
||
|
|
</plugin>
|
||
|
|
|
||
|
|
<plugin>
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|