This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
The following commit(s) were added to refs/heads/master by this push:
new c05870d8 Update from JUnit 4 to JUnit 5 Vintage
c05870d8 is described below
commit c05870d82501295890f6fcea48b9770d06983dc0
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Oct 1 13:20:17 2024 -0400
Update from JUnit 4 to JUnit 5 Vintage
---
commons-jcs3-core/pom.xml | 13 +++++++----
commons-jcs3-jcache-extras/pom.xml | 13 +++++++----
commons-jcs3-jcache-openjpa/pom.xml | 14 +++++++-----
commons-jcs3-jcache-tck/pom.xml | 15 +++++++------
commons-jcs3-jcache/pom.xml | 9 ++++++--
.../commons-jcs3-filecache/pom.xml | 10 +++++++--
commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml | 10 +++++++--
pom.xml | 25 +++++++++++-----------
src/changes/changes.xml | 3 ++-
9 files changed, 73 insertions(+), 39 deletions(-)
diff --git a/commons-jcs3-core/pom.xml b/commons-jcs3-core/pom.xml
index 6b67e653..52e3a30e 100644
--- a/commons-jcs3-core/pom.xml
+++ b/commons-jcs3-core/pom.xml
@@ -86,13 +86,18 @@
<!-- Test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
diff --git a/commons-jcs3-jcache-extras/pom.xml
b/commons-jcs3-jcache-extras/pom.xml
index a095e67b..b73486b6 100644
--- a/commons-jcs3-jcache-extras/pom.xml
+++ b/commons-jcs3-jcache-extras/pom.xml
@@ -44,13 +44,18 @@
<artifactId>javaee-api</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/commons-jcs3-jcache-openjpa/pom.xml
b/commons-jcs3-jcache-openjpa/pom.xml
index b0a3f3f5..df5d3306 100644
--- a/commons-jcs3-jcache-openjpa/pom.xml
+++ b/commons-jcs3-jcache-openjpa/pom.xml
@@ -51,15 +51,19 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/commons-jcs3-jcache-tck/pom.xml b/commons-jcs3-jcache-tck/pom.xml
index c790a605..af37e263 100644
--- a/commons-jcs3-jcache-tck/pom.xml
+++ b/commons-jcs3-jcache-tck/pom.xml
@@ -67,20 +67,23 @@
<groupId>${project.groupId}</groupId>
<artifactId>commons-jcs3-core</artifactId>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>commons-jcs3-jcache</artifactId>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
diff --git a/commons-jcs3-jcache/pom.xml b/commons-jcs3-jcache/pom.xml
index e5ec6aa8..124735a6 100644
--- a/commons-jcs3-jcache/pom.xml
+++ b/commons-jcs3-jcache/pom.xml
@@ -59,8 +59,13 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml
b/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml
index 269e0b0d..023dbdb4 100644
--- a/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml
+++ b/commons-jcs3-sandbox/commons-jcs3-filecache/pom.xml
@@ -43,8 +43,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml
b/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml
index ac325cd9..0485b57b 100644
--- a/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml
+++ b/commons-jcs3-sandbox/commons-jcs3-yajcache/pom.xml
@@ -53,8 +53,14 @@
<version>${commons.log4j.version}</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 00d75a47..d2008a54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -333,25 +333,24 @@
</dependency>
<!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${commons.junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${commons.junit.version}</version>
+ <scope>test</scope>
+ </dependency>
<!-- Exclude for now -->
<!-- dependency>
<groupId>org.jgroups</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 01a8a2eb..cce94e19 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -78,7 +78,8 @@
<action type="update" dev="ggregory" due-to="Dependabot">Bump
org.apache.tomcat:tomcat-catalina from 9.0.79 to 9.0.83 in
/commons-jcs3-jcache-extras.</action>
<action type="update" dev="ggregory" due-to="Dependabot, Gary
Gregory">Bump commons-logging:commons-logging from 1.3.0 to 1.3.4 #253, #262,
#278.</action>
<action type="update" dev="ggregory" due-to="Dependabot, Gary
Gregory">Bump org.apache.commons:commons-text from 1.11.0 to 1.12.0
#254.</action>
- <action type="update" dev="ggregory" due-to="Dependabot, Gary
Gregory">Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 #265,
#271, #281.</action>
+ <action type="update" dev="ggregory" due-to="Dependabot, Gary
Gregory">Bump org.apache.commons:commons-lang3 from 3.14.0 to 3.17.0 #265,
#271, #281.</action>
+ <action type="update" dev="ggregory" due-to="Dependabot, Gary
Gregory">Update from JUnit 4 to JUnit 5 Vintage.</action>
</release>
<release version="3.2.1" date="2024-05-27" description="JDK bug fix
release">
<action dev="tv" type="fix">
