From c0aa6e11caf336d5fc79de883a4459863f905eea Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 9 Mar 2020 13:07:35 +0100
Subject: [PATCH] Update to upstream version 4.2

---
 .gitignore    |  1 +
 easymock.spec | 16 +++++++++++++---
 sources       |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0cbacf3..380682d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ easymock-1.2-src.tar.gz
 /easymock-3.4.tar.gz
 /easymock-3.5.tar.gz
 /easymock-4.0.2.tar.gz
+/easymock-4.2.tar.gz
diff --git a/easymock.spec b/easymock.spec
index 9549f0e..2195bc1 100644
--- a/easymock.spec
+++ b/easymock.spec
@@ -1,6 +1,6 @@
 Name:           easymock
-Version:        4.0.2
-Release:        2%{?dist}
+Version:        4.2
+Release:        1%{?dist}
 Summary:        Easy mock objects
 License:        ASL 2.0
 URL:            http://www.easymock.org
@@ -22,15 +22,18 @@ BuildRequires:  mvn(cglib:cglib)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
-BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit47)
+BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit-platform)
 BuildRequires:  mvn(org.apache.maven.surefire:surefire-testng)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
+BuildRequires:  mvn(org.junit.vintage:junit-vintage-engine)
 BuildRequires:  mvn(org.objenesis:objenesis)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.testng:testng)
 # xmvn-builddep misses this:
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
 
+
 Provides:       %{name}3 = %{version}-%{release}
 
 %description
@@ -58,6 +61,10 @@ Javadoc for %{name}.
 %pom_remove_plugin :animal-sniffer-maven-plugin
 %pom_remove_plugin :animal-sniffer-maven-plugin core
 
+%pom_remove_plugin :maven-gpg-plugin test-testng
+%pom_remove_plugin :maven-gpg-plugin test-java8
+%pom_remove_plugin :maven-gpg-plugin test-junit5
+
 # remove android support
 rm core/src/main/java/org/easymock/internal/Android*.java
 rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
@@ -97,6 +104,9 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %license core/LICENSE.txt
 
 %changelog
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 4.2-1
+- Update to upstream version 4.2
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.2-2
 - Mass rebuild for javapackages-tools 201902
 
diff --git a/sources b/sources
index 1ef16d1..b7b960d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (easymock-4.0.2.tar.gz) = ee6bb5dfd7dbfe92cf09089cf928be4e333c106750a1bd54624ba42693e90d35e07b9d2201c528a26b02cec35b136733ac48248bf66ebfec5ae35e89a48db3ec
+SHA512 (easymock-4.2.tar.gz) = f5bb5cf7a99ac8819c9b8ac9ab587a4526ce7febd442d128241c8a2c6ace5e47226881e42f492db98617ee6c2a8e3edf588f6595142b93fec512f9ba5e972dca