From 20212a87d9eb37239e69ef7ee58a2c75461e8963 Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:10:42 +0100
Subject: [PATCH 1/2] JUnit v5 api dependency to core

---
 core/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 9ab9db15..5f7196f4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,6 +40,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

From 7ec8246a3c66dbef002358883a59d85fbad7b047 Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:14:32 +0100
Subject: [PATCH 2/2] JUnit5 assertThrows CloningProviderTest

---
 .../commons/proxy2/provider/CloningProviderTest.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java b/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java
index c320dc76..c83ecc8d 100644
--- a/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java
+++ b/core/src/test/java/org/apache/commons/proxy2/provider/CloningProviderTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Date;
 
@@ -69,18 +70,18 @@ public void testWithExceptionThrown()
         }
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testWithInvalidCloneable()
     {
-        assertNotNull(new CloningProvider<InvalidCloneable>(new InvalidCloneable())); // assert is used to avoid not used warning
+        assertThrows(IllegalArgumentException.class, () -> new CloningProvider<InvalidCloneable>(new InvalidCloneable()));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testWithProtectedCloneMethod()
     {
         final CloningProvider<ProtectedCloneable> provider = new CloningProvider<ProtectedCloneable>(
                 new ProtectedCloneable());
-        provider.getObject();
+        assertThrows(IllegalArgumentException.class, () -> provider.getObject());
     }
 
     //**********************************************************************************************************************