.easymock.metadata

@@ -1 +1,2 @@
-360dd15d7f8ef2cc4ca37de7495f272c348f2e2c SOURCES/easymock-4.0.2.tar.gz
+694e2b07ae50b780ba5c69191d53d7fede67b59c SOURCES/generate-tarball.sh
+01c88efb013098238432986d3db7d6be5050aa43 SOURCES/easymock-4.2.tar.gz

.gitignore

@@ -1 +0,0 @@
-SOURCES/easymock-4.0.2.tar.gz

SOURCES/generate-tarball.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-name=easymock
-version="$(sed -n 's/Version:\s*//p' *.spec)"
-
-# RETRIEVE
-wget "https://github.com/${name}/${name}/archive/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-cd tarball-tmp
-tar xf "../${name}-${version}.orig.tar.gz"
-
-# CLEAN TARBALL
-find -name '*.jar' -delete
-find -name '*.class' -delete
-# Contains minified js of uncertain origin
-rm -r */website
-
-tar cf "../${name}-${version}.tar.gz" *
-cd ..
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

SPECS/easymock.spec

@@ -1,6 +1,8 @@
+%bcond_with bootstrap
+
 Name:           easymock
-Version:        4.0.2
-Release:        2%{?dist}
+Version:        4.2
+Release:        8%{?dist}
 Summary:        Easy mock objects
 License:        ASL 2.0
 URL:            http://www.easymock.org
@@ -16,20 +18,30 @@ Patch3:         0003-Fix-OSGi-manifest.patch
 Patch4:         0004-Port-to-hamcrest-2.1.patch
 
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
 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)
+%endif
 # xmvn-builddep misses this:
+%if %{without bootstrap}
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
+%endif
+
 
 Provides:       %{name}3 = %{version}-%{release}
 
@@ -58,6 +70,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
@@ -84,6 +100,21 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 # ssh not needed during our builds
 %pom_xpath_remove pom:extensions
 
+# Force Surefire to run tests with JUnit, not with TestNG
+%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']" \
+    "<configuration><testNGArtifactName>none:none</testNGArtifactName></configuration>" core
+
+# Workaround Java 17 compatibility issue that should be fixed in
+# easymock 4.4: https://github.com/easymock/easymock/issues/274
+%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \
+    "<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED</argLine>" core
+%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \
+    "<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>" test-testng
+%pom_add_plugin :maven-surefire-plugin test-java8 "<configuration>
+    <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine></configuration>"
+%pom_add_plugin :maven-surefire-plugin test-junit5 "<configuration>
+    <argLine>--add-opens=java.base/java.lang=ALL-UNNAMED</argLine></configuration>"
+
 %build
 %mvn_build
 
@@ -97,15 +128,64 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %license core/LICENSE.txt
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2-7
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-5
+- Workaround build issue with OpenJDK 17
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-3
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 31 2020 Fabio Valentini <decathorpe@gmail.com> - 4.2-1
+- Update to version 4.2.
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.6-6
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 4.2-1
+- Update to upstream version 4.2
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.2-2
 - Mass rebuild for javapackages-tools 201902
 
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 4.0.2-1
 - Update to upstream version 4.0.2
 
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-5
 - Mass rebuild for javapackages-tools 201901
 
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Nov 30 2018 Mat Booth <mat.booth@redhat.com> - 3.6-2
+- Rebuild to fix OSGi dependency on ASM 7
+
+* Mon Oct  8 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-1
+- Update to upstream version 3.6
+
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 3.5-4
 - Repack the tarball without binaries