This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new d9f7d57 [SHIRO-777] Update JUnit
new fef7188 Merge pull request #237 from bmhm/SHIRO-776-junit5
d9f7d57 is described below
commit d9f7d57a38d745711cbcabdebc7980165a5f8247
Author: Benjamin Marwell <[email protected]>
AuthorDate: Tue May 12 07:18:47 2020 +0200
[SHIRO-777] Update JUnit
---
integration-tests/support/pom.xml | 11 ++++++-----
pom.xml | 35 ++++++++++++++++++++++++++++++-----
2 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/integration-tests/support/pom.xml
b/integration-tests/support/pom.xml
index bcfd9fd..2119ec4 100644
--- a/integration-tests/support/pom.xml
+++ b/integration-tests/support/pom.xml
@@ -115,11 +115,12 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>compile</scope>
+ </dependency>
<!-- dependency on the Base64 class
in 2.0 this is split out, so this dep will be removed
diff --git a/pom.xml b/pom.xml
index 4ed5742..086f931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<easymock.version>4.0.2</easymock.version>
<gmaven.version>1.8.0</gmaven.version>
<groovy.version>3.0.3</groovy.version>
- <junit.version>4.12</junit.version>
+ <junit.version>5.6.2</junit.version>
<junit.server.jetty.version>0.11.0</junit.server.jetty.version>
<hibernate.version>5.4.3.Final</hibernate.version>
<taglibs.standard.version>1.2.5</taglibs.standard.version>
@@ -661,9 +661,20 @@
are test dependencies. Actual compile or runtime dependencies
should be
explicitly declared in a child module, referencing the dependency
defined
in this file's <dependencyManagement> section. -->
+ <!-- ... -->
<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-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -829,10 +840,24 @@
<!-- 3rd party dependencies -->
+ <!-- ... -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</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>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<!-- used for the 'hashpass' command line tool: -->
