diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index b4c3b6c..7d16d25 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,15 @@ -easymock-1.2-src.tar.gz +/results_* +/*.src.rpm + +/easymock-1.2-src.tar.gz +/easymock-1.2_Java1.5.pom +/easymock-3.2.tar.gz +/easymock-3.3.tar.gz +/easymock-3.3.1.tar.gz +/easymock-3.4.tar.gz +/easymock-3.5.tar.gz +/easymock-3.6.tar.gz +/easymock-4.0.2.tar.gz +/easymock-4.2.tar.gz +/easymock-4.3.tar.gz +/easymock-5.6.0.tar.gz diff --git a/0001-Disable-android-support.patch b/0001-Disable-android-support.patch new file mode 100644 index 0000000..fddb078 --- /dev/null +++ b/0001-Disable-android-support.patch @@ -0,0 +1,29 @@ +From 3458c2cd3d453dbb866c9515568b288529af05a5 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 30 May 2016 14:24:43 +0200 +Subject: [PATCH 1/2] Disable android support + +--- + core/src/main/java/org/easymock/internal/MocksControl.java | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/core/src/main/java/org/easymock/internal/MocksControl.java b/core/src/main/java/org/easymock/internal/MocksControl.java +index b86f1a1..cfa0fa1 100644 +--- a/core/src/main/java/org/easymock/internal/MocksControl.java ++++ b/core/src/main/java/org/easymock/internal/MocksControl.java +@@ -154,12 +154,6 @@ public class MocksControl implements IMocksControl, IExpectationSetters, + return cached; + } + +- // ///CLOVER:OFF +- if (AndroidSupport.isAndroid()) { +- return classProxyFactory = new AndroidClassProxyFactory(); +- } +- // ///CLOVER:ON +- + return classProxyFactory = new ClassProxyFactory(); + } + +-- +2.51.0 + diff --git a/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch b/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch new file mode 100644 index 0000000..0a1e070 --- /dev/null +++ b/0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch @@ -0,0 +1,94 @@ +From 9c100b4d67397bd096de6caaef58cd8c9f49c692 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 23 Sep 2025 12:03:42 +0200 +Subject: [PATCH 2/2] Migrate from deprecated Hamcrest `is` to `isA` + +Replace usages of `is(Class)` with `isA(Class)` in +`EasyMockSupportClassTest` to avoid relying on the deprecated +`org.hamcrest.core.Is.is` method. This removes the need for +`@SuppressWarnings("deprecation")` and keeps the tests aligned with +current Hamcrest best practices. +--- + .../tests2/EasyMockSupportClassTest.java | 21 +++++++++---------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +index cbe9e01..9b89ed5 100644 +--- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java ++++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java +@@ -25,12 +25,11 @@ import org.junit.jupiter.api.Test; + import java.lang.reflect.Method; + + import static org.easymock.EasyMock.*; +-import static org.hamcrest.core.Is.*; ++import static org.hamcrest.core.Is.isA; + + /** + * @author Henri Tremblay + */ +-@SuppressWarnings("deprecation") + class EasyMockSupportClassTest extends EasyMockSupport { + + public static class ToMock { +@@ -49,49 +48,49 @@ class EasyMockSupportClassTest extends EasyMockSupport { + @Test + void testCreateStrictControl() { + IMocksControl ctrl = createStrictControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateControl() { + IMocksControl ctrl = createControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceControl() { + IMocksControl ctrl = createNiceControl(); +- MatcherAssert.assertThat(ctrl.createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(ctrl.createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateStrictMockClassOfT() { +- MatcherAssert.assertThat(createStrictMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createStrictMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateStrictMockStringClassOfT() { +- MatcherAssert.assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createStrictMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateMockClassOfT() { +- MatcherAssert.assertThat(createMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateMockStringClassOfT() { +- MatcherAssert.assertThat(createMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceMockClassOfT() { +- MatcherAssert.assertThat(createNiceMock(ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createNiceMock(ToMock.class), isA(ToMock.class)); + } + + @Test + void testCreateNiceMockStringClassOfT() { +- MatcherAssert.assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class)); ++ MatcherAssert.assertThat(createNiceMock("myMock", ToMock.class), isA(ToMock.class)); + } + + @Test +-- +2.51.0 + diff --git a/changelog b/changelog new file mode 100644 index 0000000..946e90d --- /dev/null +++ b/changelog @@ -0,0 +1,230 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 4.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 4.3-9 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 4.3-8 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 4.3-7 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 4.3-4 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Sep 08 2022 Marian Koncek - 4.3-1 +- Update to upstream version 4.3 + +* Thu Jul 21 2022 Fedora Release Engineering - 4.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 4.2-7 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 4.2-5 +- Workaround build issue with OpenJDK 17 + +* Wed Jul 21 2021 Fedora Release Engineering - 4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 4.2-3 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 31 2020 Fabio Valentini - 4.2-1 +- Update to version 4.2. + +* Mon Jul 27 2020 Fedora Release Engineering - 3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.6-6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Mar 04 2020 Marian Koncek - 4.2-1 +- Update to upstream version 4.2 + +* Tue Jan 28 2020 Fedora Release Engineering - 3.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.0.2-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 18 2019 Marian Koncek - 4.0.2-1 +- Update to upstream version 4.0.2 + +* Fri May 24 2019 Mikolaj Izdebski - 3.5-5 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Nov 30 2018 Mat Booth - 3.6-2 +- Rebuild to fix OSGi dependency on ASM 7 + +* Mon Oct 8 2018 Mikolaj Izdebski - 3.6-1 +- Update to upstream version 3.6 + +* Tue Jul 31 2018 Michael Simacek - 3.5-4 +- Repack the tarball without binaries + +* Thu Jul 12 2018 Fedora Release Engineering - 3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 18 2017 Mikolaj Izdebski - 3.5-1 +- Update to upstream version 3.5 + +* Fri Sep 15 2017 Mat Booth - 3.4-6 +- Regenerate OSGi metadata due to Objectweb ASM upgrade + +* Wed Jul 26 2017 Fedora Release Engineering - 3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 23 2017 Mikolaj Izdebski - 3.4-4 +- Add missing BR on apache-resource-bundles + +* Tue Feb 07 2017 Michael Simacek - 3.4-3 +- Remove useless license-plugin + +* Wed Jun 1 2016 Mikolaj Izdebski - 3.4-2 +- Fix OSGi manifest +- Resolves: rhbz#1341052 + +* Mon May 30 2016 Michael Simacek - 3.4-1 +- Update to upstream version 3.4 + +* Mon May 30 2016 Mikolaj Izdebski - 3.3.1-5 +- Port to maven-jar-plugin 3.0.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jul 13 2015 Mikolaj Izdebski - 3.3.1-3 +- Obsolete easymock2 +- Resolves: rhbz#1172958 + +* Wed Jun 17 2015 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 5 2015 Alexander Kurtakov 3.3.1-1 +- Update to upstream 3.3.1 release. + +* Sat Mar 07 2015 Michael Simacek - 3.3-2 +- Remove retired maven-timestamp-plugin + +* Tue Nov 25 2014 Mikolaj Izdebski - 3.3-1 +- Update to upstream version 3.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 3.2-2 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Aug 30 2013 Mikolaj Izdebski - 0:3.2-1 +- Update to upstream version 3.2 + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Feb 18 2013 Tomas Radej - 0:1.2-20 +- Fixed sources (bz #905973) + +* Wed Feb 13 2013 Fedora Release Engineering - 0:1.2-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 27 2012 Tomas Radej - 0:1.2-18 +- Removed ownership of _mavenpomdir + +* Thu Aug 16 2012 Mikolaj Izdebski - 0:1.2-17 +- Add LICENSE file +- Remove rpm bug workaround +- Update to current packaging guidelines + +* Wed Jul 18 2012 Fedora Release Engineering - 0:1.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 21 2012 Tomas Radej - 0:1.2-15 +- Removed test + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Nov 26 2010 Stanislav Ochotnicky - 0:1.2-12 +- Fix pom filename (Resolves rhbz#655795) +- Remove clean section and buildroot declaration +- Remove versioned jars and pom files + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-11 +- Bump release for rebuild. + +* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-10 +- Disable tests. + +* Mon May 18 2009 Fernando Nasser 0:1.2-9 +- Update instructions for obtaining source tar ball + +* Mon May 04 2009 Yong Yang 0:1.2-8 +- Rebuild with maven2-2.0.8 built in non-bootstrap mode + +* Wed Mar 18 2009 Yong Yang 0:1.2-7 +- merge from JPP-6 +- rebuild with new maven2 2.0.8 built in bootstrap mode + +* Mon Feb 02 2009 David Walluck 0:1.2-6 +- fix component-info.xml + +* Mon Feb 02 2009 David Walluck 0:1.2-5 +- remove unneeded maven flag + +* Mon Feb 02 2009 David Walluck 0:1.2-4 +- add repolib + +* Fri Jan 30 2009 Will Tatam 1.2-3.jpp5 +- Inital JPP-5 Build + +* Fri Jan 09 2009 Yong Yang 1.2-2jpp.1 +- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6 + +* Fri Apr 11 2008 Deepak Bhole 1.2-1jpp.1 +- Import from JPackage +- Add pom file + +* Fri Feb 24 2006 Ralph Apel - 0:1.2-1jpp +- Update to 1.2 keeping only java 1.4 requirement + +* Fri Feb 24 2006 Ralph Apel - 0:1.1-3jpp +- drop java-1.3.1 requirement + +* Mon Oct 04 2004 Ralph Apel - 0:1.1-2jpp +- Fixed Url, Summary, Description and License + +* Mon Oct 04 2004 Ralph Apel - 0:1.1-1jpp +- First JPackage release diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/easymock-1.2-build_xml.patch b/easymock-1.2-build_xml.patch deleted file mode 100644 index 9d9a1f5..0000000 --- a/easymock-1.2-build_xml.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- build.xml.sav 2005-08-07 17:53:29.000000000 +0200 -+++ build.xml 2006-02-24 16:25:45.000000000 +0100 -@@ -17,7 +17,7 @@ - - - -- -+ - - - -@@ -99,14 +99,16 @@ - - - -- -+ - - -- -+ - - - -+ - - - diff --git a/easymock-1.2_Java1.5.pom b/easymock-1.2_Java1.5.pom deleted file mode 100644 index 82fbac3..0000000 --- a/easymock-1.2_Java1.5.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - easymock - easymock - EasyMock 1.2_Java1.5 - 1.2_Java1.5 - diff --git a/easymock-component-info.xml b/easymock-component-info.xml deleted file mode 100644 index 95ec60d..0000000 --- a/easymock-component-info.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/easymock.spec b/easymock.spec index 106434f..20ee9a9 100644 --- a/easymock.spec +++ b/easymock.spec @@ -1,57 +1,47 @@ -# Copyright (c) 2000-2009, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +%bcond_with bootstrap Name: easymock -Version: 1.2 -Release: 11%{?dist} -Epoch: 0 +Version: 5.6.0 +Release: %autorelease Summary: Easy mock objects -Group: Development/Libraries -License: MIT -URL: http://www.easymock.org/ -# cvs -d:pserver:anonymous@easymock.cvs.sourceforge.net:/cvsroot/easymock login -# cvs -z3 -d:pserver:anonymous@easymock.cvs.sourceforge.net:/cvsroot/easymock export -r EasyMock1_2_Java1_3 easymock -# tar czf easymock-1.2-src.tar.gz easymock -Source0: easymock-1.2-src.tar.gz -Source1: http://repo1.maven.org/maven2/easymock/easymock/1.2_Java1.5/easymock-1.2_Java1.5.pom -Source2: easymock-component-info.xml -Patch0: easymock-1.2-build_xml.patch -Requires(post): jpackage-utils >= 1.7.2 -Requires(postun): jpackage-utils >= 1.7.2 -BuildRequires: jpackage-utils >= 0:1.6 -BuildRequires: ant >= 0:1.6 -BuildRequires: ant-junit >= 0:1.6 -BuildRequires: junit >= 0:3.8.1 -BuildRequires: java-devel >= 0:1.5.0 +License: Apache-2.0 +URL: https://www.easymock.org BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +ExclusiveArch: %{java_arches} noarch + +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +# Remove bundled binaries which cannot be easily verified for licensing +Source1: generate-tarball.sh + +Patch: 0001-Disable-android-support.patch +# Forwarded: https://github.com/easymock/easymock/pull/807 +Patch: 0002-Migrate-from-deprecated-Hamcrest-is-to-isA.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local-openjdk25 +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.bytebuddy:byte-buddy) +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-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 +%if %{without bootstrap} +# xmvn-builddep misses this: +BuildRequires: mvn(org.apache:apache-jar-resource-bundle) +%endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 4.3-23 +Provides: %{name}3 = %{version}-%{release} %description EasyMock provides Mock Objects for interfaces in JUnit tests by generating @@ -59,120 +49,66 @@ them on the fly using Java's proxy mechanism. Due to EasyMock's unique style of recording expectations, most refactorings will not affect the Mock Objects. So EasyMock is a perfect fit for Test-Driven Development. -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation - -%description javadoc -Javadoc for %{name}. - %prep -%setup -q -n %{name} -%patch0 -p0 -mkdir lib -pushd lib -ln -sf $(build-classpath junit) . -popd +%autosetup -p1 -C -# We no longer ship a 1.3/1.4 VM, Set it to generic javahome -rm easymockbuild.properties -echo "java\ 1.3=%{java}" >> easymockbuild.properties -echo "java\ 1.4=%{java}" >> easymockbuild.properties -echo "java\ 1.5=%{java}" >> easymockbuild.properties -echo "java\ compiler=%{javac}" >> easymockbuild.properties + +%pom_remove_plugin -r :maven-javadoc-plugin +%pom_remove_plugin -r :maven-source-plugin +%pom_remove_plugin :license-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin +%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 +%pom_disable_module test-android +%pom_remove_dep :dexmaker core + +# unbundle asm and cglib +%pom_disable_module test-nodeps + +# missing test deps +%pom_disable_module test-integration +%pom_disable_module test-osgi + +# remove some warning caused by unavailable plugin +%pom_remove_plugin org.codehaus.mojo:versions-maven-plugin + +# For compatibility reasons +%mvn_file ":easymock{*}" easymock@1 easymock3@1 + +# 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']" \ + "none:none" 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" \ + "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED" core +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" \ + "--add-opens=java.base/java.lang=ALL-UNNAMED" test-testng +%pom_add_plugin :maven-surefire-plugin test-java8 " + --add-opens=java.base/java.lang=ALL-UNNAMED" +%pom_add_plugin :maven-surefire-plugin test-junit5 " + --add-opens=java.base/java.lang=ALL-UNNAMED" %build -export OPT_JAR_LIST="ant/ant-junit junit" -export CLASSPATH= -%{ant} -Dbuild.sysclasspath=first +%mvn_build -j %install -rm -rf $RPM_BUILD_ROOT +%mvn_install -unzip -qq %{name}%{version}_Java1.3.zip -install -dm 755 $RPM_BUILD_ROOT%{_javadir} - -install -pm 644 %{name}%{version}_Java1.3/%{name}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar - -# javadoc -install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr %{name}%{version}_Java1.3/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -# pom -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/ -%add_to_maven_depmap easymock easymock %{version}_Java1.5 JPP easymock - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap - -%postun -%update_maven_depmap - -%files -%defattr(0644,root,root,0755) -%doc %{name}%{version}_Java1.3/{Documentation,License}.html -%{_datadir}/maven2/* -%{_mavendepmapfragdir}/* -%{_javadir}/%{name}-%{version}.jar -%{_javadir}/%{name}.jar - -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} +%files -f .mfiles +%license core/LICENSE.txt %changelog -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-11 -- Bump release for rebuild. - -* Thu Aug 20 2009 Alexander Kurtakov 0:1.2-10 -- Disable tests. - -* Mon May 18 2009 Fernando Nasser 0:1.2-9 -- Update instructions for obtaining source tar ball - -* Mon May 04 2009 Yong Yang 0:1.2-8 -- Rebuild with maven2-2.0.8 built in non-bootstrap mode - -* Wed Mar 18 2009 Yong Yang 0:1.2-7 -- merge from JPP-6 -- rebuild with new maven2 2.0.8 built in bootstrap mode - -* Mon Feb 02 2009 David Walluck 0:1.2-6 -- fix component-info.xml - -* Mon Feb 02 2009 David Walluck 0:1.2-5 -- remove unneeded maven flag - -* Mon Feb 02 2009 David Walluck 0:1.2-4 -- add repolib - -* Fri Jan 30 2009 Will Tatam 1.2-3.jpp5 -- Inital JPP-5 Build - -* Fri Jan 09 2009 Yong Yang 1.2-2jpp.1 -- Imported from dbhole's maven 2.0.8 packages, initial building on jpp6 - -* Fri Apr 11 2008 Deepak Bhole 1.2-1jpp.1 -- Import from JPackage -- Add pom file - -* Fri Feb 24 2006 Ralph Apel - 0:1.2-1jpp -- Update to 1.2 keeping only java 1.4 requirement - -* Fri Feb 24 2006 Ralph Apel - 0:1.1-3jpp -- drop java-1.3.1 requirement - -* Mon Oct 04 2004 Ralph Apel - 0:1.1-2jpp -- Fixed Url, Summary, Description and License - -* Mon Oct 04 2004 Ralph Apel - 0:1.1-1jpp -- First JPackage release +%autochangelog diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..cd9e1f7 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,23 @@ +#!/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 +pushd 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 -czf "../${name}-${version}.tar.gz" * +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 +execute: + how: tmt diff --git a/sources b/sources index d820270..65a1be4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6a02c912ad98d485141d240faf68440 easymock-1.2-src.tar.gz +SHA512 (easymock-5.6.0.tar.gz) = a285cbfbd80eb6dad50f92a6bce7a494a06f8da33350bca41d5e7ead5a76219f5bbcf579e89be34525628bdc6c81b266db697ea2b1d6bf023759c294fd375329