You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/10/26 19:47:31 UTC
[jspwiki] 01/06: Upgrade to JUnit 5 (I): surefire updated to 2.22.0,
JUnit 5 bom dependency imported,
replaced JUnit 4 dependency with JUnit 5 ones
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit ffd14b4c1e42f3e11c3e5a1d00d3f1cc33df7d7f
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Oct 26 20:13:55 2018 +0200
Upgrade to JUnit 5 (I): surefire updated to 2.22.0, JUnit 5 bom dependency imported, replaced JUnit 4 dependency with JUnit 5 ones
---
jspwiki-markdown/pom.xml | 16 ++++++++++++++--
jspwiki-war/pom.xml | 16 ++++++++++++++--
pom.xml | 13 ++++++++-----
3 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/jspwiki-markdown/pom.xml b/jspwiki-markdown/pom.xml
index 8fc0cdd..fc7d996 100755
--- a/jspwiki-markdown/pom.xml
+++ b/jspwiki-markdown/pom.xml
@@ -63,8 +63,20 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index ff8cf95..c265edd 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -179,8 +179,20 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index ecb9d02..6fdd49a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<flexmark.version>0.34.46</flexmark.version>
<jdk.version>1.8</jdk.version>
+ <junit.version>5.3.1</junit.version>
<maven.compiler.source>${jdk}</maven.compiler.source> <!-- override values from parent pom -->
<maven.compiler.target>${jdk}</maven.compiler.target>
<lucene.version>4.7.0</lucene.version>
@@ -244,9 +245,11 @@
<!-- test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>${junit.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
@@ -491,12 +494,12 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>2.22.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.21.0</version>
+ <version>2.22.0</version>
</plugin>
<plugin>