From 5ccafad3624bab30030179d467540b6a15f84600 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:31:29 +0100 Subject: [PATCH 01/18] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index f5beee1..8ccb9c2 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 +- bump of release for for java-21-openjdk as system jdk + * Thu Jan 25 2024 Fedora Release Engineering - 5.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From acac41cab8eca111658d54561c4ef0310b23a778 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:23:53 +0100 Subject: [PATCH 02/18] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 8ccb9c2..89ccff3 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 - bump of release for for java-21-openjdk as system jdk From 33624bf94400e80f1cc8042809c9f2349717c721 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:24:36 +0000 Subject: [PATCH 03/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mockito.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 89ccff3..940666b 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,6 +142,9 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 5.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 - Rebuilt for java-21-openjdk as system jdk From df6887b9fd7bf0407d75cb7b2535ee3a402f1dbd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 04/18] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 8d738b40efb6fd6555ac38371eb0304e263dd5aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:32:53 +0200 Subject: [PATCH 05/18] Use %autosetup -C --- mockito.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 940666b..0c9acd7 100644 --- a/mockito.spec +++ b/mockito.spec @@ -58,7 +58,7 @@ Requires: %{name} = %{version}-%{release} Mockito JUnit 5 support. %prep -%autosetup -p1 +%autosetup -p1 -C cp %{SOURCE2} aggregator.pom cp %{SOURCE3} pom.xml From 3e01842ad54ee72194cb4ad6d78ae43bc87307c1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 06/18] Switch to non-numdered patches --- mockito.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 0c9acd7..07c88fe 100644 --- a/mockito.spec +++ b/mockito.spec @@ -22,7 +22,7 @@ Source4: https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter # Mockito expects byte-buddy to have a shaded/bundled version of ASM, but # we don't bundle in Fedora, so this patch makes mockito use ASM explicitly -Patch0: use-unbundled-asm.patch +Patch: use-unbundled-asm.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 47306d3af002049f777906fae0b25b98679b45a6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:15 +0200 Subject: [PATCH 07/18] Convert to %autorelease and %autochangelog --- changelog | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++ mockito.spec | 236 +-------------------------------------------------- 2 files changed, 235 insertions(+), 234 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..5458ada --- /dev/null +++ b/changelog @@ -0,0 +1,233 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 5.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 5.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 5.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 13 2023 Marian Koncek - 5.8.0-1 +- Update to upstream version 5.8.0 + +* Fri Sep 01 2023 Marian Koncek - 5.5.0-1 +- Update to upstream version 5.5.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.12.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.12.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.12.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Apr 09 2022 Didik Supriadi - 3.12.4-4 +- Set javac compiler release to Java 8 + +* Sat Feb 05 2022 Jiri Vanek - 3.12.4-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 27 2022 Mikolaj Izdebski - 3.12.4-2 +- Don't build mockito-junit-jupiter in bootstrap mode + +* Sat Jan 22 2022 Jerry James - 3.12.4-1 +- Version 3.12.4 +- Add inline and junit-jupiter subpackages +- Drop OpenJDK 17 workarounds + +* Thu Jan 20 2022 Fedora Release Engineering - 3.7.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Nov 03 2021 Mikolaj Izdebski - 3.7.13-4 +- Workaround build issue with OpenJDK 17 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.7.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.7.13-2 +- Bootstrap build +- Non-bootstrap build + +* Thu Feb 04 2021 Marian Koncek - 3.7.13-1 +- Update to upstream version 3.7.13 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.5.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 9 2020 Stuart Gathman - 3.5.13-1 +- Update to version 3.5.13 + +* Wed Sep 30 2020 Marian Koncek - 3.5.13-1 +- Update to ustream version 3.5.13 + +* Sun Aug 23 2020 Jerry James - 3.5.5-1 +- Update to version 3.5.5 + +* Fri Aug 14 2020 Jerry James - 2.28.2-1 +- Update to version 2.28.2 + +* Tue Jul 28 2020 Fedora Release Engineering - 2.23.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 22 2020 Marian Koncek - 3.4.5-1 +- Update to upstream version 3.4.5 + +* Sat Jul 11 2020 Jiri Vanek - 2.23.9-7 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.23.9-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.2-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Oct 16 2019 Marian Koncek - 3.1.2-1 +- Update to upstream version 3.1.2 + +* Thu Sep 19 2019 Marian Koncek - 3.0.8-1 +- Update to upstream version 3.0.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.23.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 2.23.9-4 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 2.23.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Dec 12 2018 Mat Booth - 2.23.9-3 +- Set the source encoding for the build + +* Wed Dec 05 2018 Mat Booth - 2.23.9-2 +- Re-add compatibility alias for 'mockito-all' + +* Tue Dec 04 2018 Mat Booth - 2.23.9-1 +- Update to latest upstream version +- Switch to maven build system using a custom pom to avoid a dep on gradle + +* Fri Aug 03 2018 Michael Simacek - 1.10.19-17 +- Remove bundled minified js from javadoc + +* Fri Jul 13 2018 Fedora Release Engineering - 1.10.19-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Igor Gnatenko - 1.10.19-15 +- Escape macros in %%changelog + +* Thu Feb 08 2018 Fedora Release Engineering - 1.10.19-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.10.19-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 16 2017 Michael Simacek - 1.10.19-12 +- Remove conditional for EOL Fedora + +* Fri Feb 10 2017 Fedora Release Engineering - 1.10.19-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Feb 22 2016 Mat Booth - 1.10.19-10 +- Explicitly import more cglib packages in OSGi metadata to prevent mockito + failing under certain circumstances during Eclipse test suites + +* Fri Feb 12 2016 Mat Booth - 1.10.19-9 +- Require hamcrest explicitly in OSGi metadata + +* Thu Feb 04 2016 Fedora Release Engineering - 1.10.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Dec 25 2015 Raphael Groner - 1.10.19-7 +- introduce License tag + +* Fri Dec 25 2015 Raphael Groner - 1.10.19-6 +- reenable osgi + +* Fri Dec 18 2015 Raphael Groner - 1.10.19-5 +- workaround rhbz#1292777 stylesheet.css not found + +* Thu Jul 16 2015 Michael Simacek - 1.10.19-4 +- Use aqute-bnd-2.4.1 + +* Mon Jun 22 2015 Mat Booth - 1.10.19-3 +- Switch to mvn_install + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 29 2015 Michal Srb - 1.10.19-1 +- Update to 1.10.19 + +* Mon Aug 25 2014 Darryl L. Pierce - 1.9.0-18 +- First build for EPEL7 +- Resolves: BZ#1110030 + +* Mon Jun 09 2014 Omair Majid - 1.9.0-17 +- Use .mfiles to pick up xmvn metadata +- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros +- Fix FTBFS + +* Sat Jun 07 2014 Fedora Release Engineering - 1.9.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 22 2014 Severin Gehwolf - 1.9.0-16 +- Use junit R/BR over junit4. + +* Fri Mar 28 2014 Michael Simacek - 1.9.0-15 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Dec 11 2013 Michael Simacek - 1.9.0-14 +- Workaround for NPE in setting NamingPolicy + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Mar 25 2013 Tomas Radej - 1.9.0-12 +- Patched LocalizedMatcher due to hamcrest update, (bug upstream) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.9.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Sep 6 2012 Severin Gehwolf 1.9.0-10 +- More Import-Package fixes. Note that fix-cglib-refs.patch is + not suitable for upstream: issue id=373 + +* Tue Sep 4 2012 Severin Gehwolf 1.9.0-9 +- Fix missing Import-Package in manifest. + +* Mon Aug 27 2012 Severin Gehwolf 1.9.0-8 +- Add aqute bnd instructions for OSGi metadata + +* Fri Jul 20 2012 Fedora Release Engineering - 1.9.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 30 2012 Roman Kennke 1.9.0-6 +- Place JavaDoc in directly under %%{_javadocdir}/%%{name} instead + of %%{_javadocdir}/%%{name}/javadoc + +* Wed Apr 25 2012 Roman Kennke 1.9.0-5 +- Removed post/postun hook for update_maven_depmap + +* Tue Apr 24 2012 Roman Kennke 1.9.0-4 +- Fix groupId of cglib dependency +- Add additional depmap for mockito-all +- Update depmap on post and postun +- Fix version in pom + +* Wed Feb 22 2012 Roman Kennke 1.9.0-3 +- Added cglib dependency to pom + +* Tue Feb 21 2012 Roman Kennke 1.9.0-2 +- Include upstream Maven pom.xml in package +- Added missing Requires for cglib, junit4, hamcrest, objenesis +- Added source tarball generating script to sources + +* Thu Feb 16 2012 Roman Kennke 1.9.0-1 +- Initial package diff --git a/mockito.spec b/mockito.spec index 07c88fe..9c01e29 100644 --- a/mockito.spec +++ b/mockito.spec @@ -2,7 +2,7 @@ Name: mockito Version: 5.8.0 -Release: 6%{?dist} +Release: %autorelease Summary: Tasty mocking framework for unit tests in Java License: MIT URL: https://site.mockito.org/ @@ -142,236 +142,4 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 5.8.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 5.8.0-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 5.8.0-4 -- bump of release for for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 5.8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 13 2023 Marian Koncek - 5.8.0-1 -- Update to upstream version 5.8.0 - -* Fri Sep 01 2023 Marian Koncek - 5.5.0-1 -- Update to upstream version 5.5.0 - -* Thu Jul 20 2023 Fedora Release Engineering - 3.12.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 3.12.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 3.12.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Apr 09 2022 Didik Supriadi - 3.12.4-4 -- Set javac compiler release to Java 8 - -* Sat Feb 05 2022 Jiri Vanek - 3.12.4-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 27 2022 Mikolaj Izdebski - 3.12.4-2 -- Don't build mockito-junit-jupiter in bootstrap mode - -* Sat Jan 22 2022 Jerry James - 3.12.4-1 -- Version 3.12.4 -- Add inline and junit-jupiter subpackages -- Drop OpenJDK 17 workarounds - -* Thu Jan 20 2022 Fedora Release Engineering - 3.7.13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Nov 03 2021 Mikolaj Izdebski - 3.7.13-4 -- Workaround build issue with OpenJDK 17 - -* Thu Jul 22 2021 Fedora Release Engineering - 3.7.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 3.7.13-2 -- Bootstrap build -- Non-bootstrap build - -* Thu Feb 04 2021 Marian Koncek - 3.7.13-1 -- Update to upstream version 3.7.13 - -* Tue Jan 26 2021 Fedora Release Engineering - 3.5.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 9 2020 Stuart Gathman - 3.5.13-1 -- Update to version 3.5.13 - -* Wed Sep 30 2020 Marian Koncek - 3.5.13-1 -- Update to ustream version 3.5.13 - -* Sun Aug 23 2020 Jerry James - 3.5.5-1 -- Update to version 3.5.5 - -* Fri Aug 14 2020 Jerry James - 2.28.2-1 -- Update to version 2.28.2 - -* Tue Jul 28 2020 Fedora Release Engineering - 2.23.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Marian Koncek - 3.4.5-1 -- Update to upstream version 3.4.5 - -* Sat Jul 11 2020 Jiri Vanek - 2.23.9-7 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 2.23.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.2-2 -- Mass rebuild for javapackages-tools 201902 - -* Wed Oct 16 2019 Marian Koncek - 3.1.2-1 -- Update to upstream version 3.1.2 - -* Thu Sep 19 2019 Marian Koncek - 3.0.8-1 -- Update to upstream version 3.0.8 - -* Thu Jul 25 2019 Fedora Release Engineering - 2.23.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 2.23.9-4 -- Mass rebuild for javapackages-tools 201901 - -* Fri Feb 01 2019 Fedora Release Engineering - 2.23.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Dec 12 2018 Mat Booth - 2.23.9-3 -- Set the source encoding for the build - -* Wed Dec 05 2018 Mat Booth - 2.23.9-2 -- Re-add compatibility alias for 'mockito-all' - -* Tue Dec 04 2018 Mat Booth - 2.23.9-1 -- Update to latest upstream version -- Switch to maven build system using a custom pom to avoid a dep on gradle - -* Fri Aug 03 2018 Michael Simacek - 1.10.19-17 -- Remove bundled minified js from javadoc - -* Fri Jul 13 2018 Fedora Release Engineering - 1.10.19-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Igor Gnatenko - 1.10.19-15 -- Escape macros in %%changelog - -* Thu Feb 08 2018 Fedora Release Engineering - 1.10.19-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.10.19-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 16 2017 Michael Simacek - 1.10.19-12 -- Remove conditional for EOL Fedora - -* Fri Feb 10 2017 Fedora Release Engineering - 1.10.19-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Feb 22 2016 Mat Booth - 1.10.19-10 -- Explicitly import more cglib packages in OSGi metadata to prevent mockito - failing under certain circumstances during Eclipse test suites - -* Fri Feb 12 2016 Mat Booth - 1.10.19-9 -- Require hamcrest explicitly in OSGi metadata - -* Thu Feb 04 2016 Fedora Release Engineering - 1.10.19-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Dec 25 2015 Raphael Groner - 1.10.19-7 -- introduce License tag - -* Fri Dec 25 2015 Raphael Groner - 1.10.19-6 -- reenable osgi - -* Fri Dec 18 2015 Raphael Groner - 1.10.19-5 -- workaround rhbz#1292777 stylesheet.css not found - -* Thu Jul 16 2015 Michael Simacek - 1.10.19-4 -- Use aqute-bnd-2.4.1 - -* Mon Jun 22 2015 Mat Booth - 1.10.19-3 -- Switch to mvn_install - -* Wed Jun 17 2015 Fedora Release Engineering - 1.10.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 29 2015 Michal Srb - 1.10.19-1 -- Update to 1.10.19 - -* Mon Aug 25 2014 Darryl L. Pierce - 1.9.0-18 -- First build for EPEL7 -- Resolves: BZ#1110030 - -* Mon Jun 09 2014 Omair Majid - 1.9.0-17 -- Use .mfiles to pick up xmvn metadata -- Don't use obsolete _mavenpomdir and _mavendepmapfragdir macros -- Fix FTBFS - -* Sat Jun 07 2014 Fedora Release Engineering - 1.9.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 22 2014 Severin Gehwolf - 1.9.0-16 -- Use junit R/BR over junit4. - -* Fri Mar 28 2014 Michael Simacek - 1.9.0-15 -- Use Requires: java-headless rebuild (#1067528) - -* Wed Dec 11 2013 Michael Simacek - 1.9.0-14 -- Workaround for NPE in setting NamingPolicy - -* Sat Aug 03 2013 Fedora Release Engineering - 1.9.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Mar 25 2013 Tomas Radej - 1.9.0-12 -- Patched LocalizedMatcher due to hamcrest update, (bug upstream) - -* Thu Feb 14 2013 Fedora Release Engineering - 1.9.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Sep 6 2012 Severin Gehwolf 1.9.0-10 -- More Import-Package fixes. Note that fix-cglib-refs.patch is - not suitable for upstream: issue id=373 - -* Tue Sep 4 2012 Severin Gehwolf 1.9.0-9 -- Fix missing Import-Package in manifest. - -* Mon Aug 27 2012 Severin Gehwolf 1.9.0-8 -- Add aqute bnd instructions for OSGi metadata - -* Fri Jul 20 2012 Fedora Release Engineering - 1.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Apr 30 2012 Roman Kennke 1.9.0-6 -- Place JavaDoc in directly under %%{_javadocdir}/%%{name} instead - of %%{_javadocdir}/%%{name}/javadoc - -* Wed Apr 25 2012 Roman Kennke 1.9.0-5 -- Removed post/postun hook for update_maven_depmap - -* Tue Apr 24 2012 Roman Kennke 1.9.0-4 -- Fix groupId of cglib dependency -- Add additional depmap for mockito-all -- Update depmap on post and postun -- Fix version in pom - -* Wed Feb 22 2012 Roman Kennke 1.9.0-3 -- Added cglib dependency to pom - -* Tue Feb 21 2012 Roman Kennke 1.9.0-2 -- Include upstream Maven pom.xml in package -- Added missing Requires for cglib, junit4, hamcrest, objenesis -- Added source tarball generating script to sources - -* Thu Feb 16 2012 Roman Kennke 1.9.0-1 -- Initial package +%autochangelog From 9a2b655987cdd4da00a061a51f562f2ae156a671 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 08/18] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 6aea715365ae785fc523532af79643b318bf2198 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 09/18] Unify spec style with the rest of Java/Maven packages [skip changelog] --- mockito.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mockito.spec b/mockito.spec index 9c01e29..41dd213 100644 --- a/mockito.spec +++ b/mockito.spec @@ -12,10 +12,8 @@ ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh - # A custom build script to allow building with maven instead of gradle Source2: aggregator.pom - # Maven central POMs for subprojects Source3: https://repo1.maven.org/maven2/org/mockito/mockito-core/%{version}/mockito-core-%{version}.pom Source4: https://repo1.maven.org/maven2/org/mockito/mockito-junit-jupiter/%{version}/mockito-junit-jupiter-%{version}.pom @@ -45,7 +43,7 @@ because the tests are very readable and they produce clean verification errors. %package javadoc -Summary: Javadocs for %{name} +Summary: Javadocs for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -136,10 +134,10 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %doc README.md doc/design-docs/custom-argument-matching.md -%files junit-jupiter -f .mfiles-junit-jupiter - %files javadoc -f .mfiles-javadoc %license LICENSE +%files junit-jupiter -f .mfiles-junit-jupiter + %changelog %autochangelog From 8ad792545c2674347cb130d660ff726925493233 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 10/18] Update javadoc package description [skip changelog] --- mockito.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mockito.spec b/mockito.spec index 41dd213..db18569 100644 --- a/mockito.spec +++ b/mockito.spec @@ -43,10 +43,10 @@ because the tests are very readable and they produce clean verification errors. %package javadoc -Summary: Javadocs for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains the API documentation for %{name}. +API documentation for %{name}. %package junit-jupiter Summary: Mockito JUnit 5 support From 067be367fd1c73aa8020b4dc346f9ad831c44cdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 18:49:35 +0000 Subject: [PATCH 11/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From efb094ed032412d0f226e6fc949186b60eaadbb1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 12/18] Remove javadoc subpackage --- mockito.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mockito.spec b/mockito.spec index db18569..54a7206 100644 --- a/mockito.spec +++ b/mockito.spec @@ -35,6 +35,8 @@ BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.opentest4j:opentest4j) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 5.8.0-16 %description Mockito is a mocking framework that tastes really good. It lets you write @@ -42,12 +44,6 @@ beautiful tests with clean & simple API. Mockito doesn't give you hangover because the tests are very readable and they produce clean verification errors. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %package junit-jupiter Summary: Mockito JUnit 5 support Requires: %{name} = %{version}-%{release} @@ -123,7 +119,7 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %mvn_package :aggregator __noinstall %build -%mvn_build -f -- -Dmaven.compiler.release=11 -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom +%mvn_build -j -f -- -Dmaven.compiler.release=11 -Dproject.build.sourceEncoding=UTF-8 -f aggregator.pom %mvn_package org.mockito:mockito-junit-jupiter junit-jupiter @@ -134,9 +130,6 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p %license LICENSE %doc README.md doc/design-docs/custom-argument-matching.md -%files javadoc -f .mfiles-javadoc -%license LICENSE - %files junit-jupiter -f .mfiles-junit-jupiter %changelog From 91a5d621bc4dfb36a100bba5611e55cbc98d8941 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 13/18] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 8cd7b14acc49b4d164746ddc4b94b1db23c4f8b9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 14/18] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 7c6ae6b01ceb483591c8f05a14e43bec1dfd0de1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 15/18] Build with OpenJDK 25 --- mockito.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockito.spec b/mockito.spec index 54a7206..73b1435 100644 --- a/mockito.spec +++ b/mockito.spec @@ -25,7 +25,7 @@ Patch: use-unbundled-asm.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.bytebuddy:byte-buddy) BuildRequires: mvn(net.bytebuddy:byte-buddy-agent) From 1bb40109081e80a8464cd719ea38085babb228f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:13:06 +0000 Subject: [PATCH 16/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5c0e88128e78313fbf7d60081aa7a17989f56583 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:43:32 +0200 Subject: [PATCH 17/18] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From 4c5f6af2518158d00e90afe76cf30f97346f7a59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Sep 2025 11:44:53 +0200 Subject: [PATCH 18/18] Remove workaround for EasyMock 4 incompatibility with Java 17 --- mockito.spec | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/mockito.spec b/mockito.spec index 73b1435..3bfe5b8 100644 --- a/mockito.spec +++ b/mockito.spec @@ -62,11 +62,6 @@ cp %{SOURCE4} subprojects/junit-jupiter/pom.xml # TODO check status: https://github.com/mockito/mockito/issues/2162 sed -i '/add_listeners_concurrently_sanity_check/i @org.junit.Ignore' src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java -# Workaround easymock incompatibility with Java 17 that should be fixed -# in easymock 4.4: https://github.com/easymock/easymock/issues/274 -%pom_add_plugin :maven-surefire-plugin . " - --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED" - # Compatibility alias %mvn_alias org.%{name}:%{name}-core org.%{name}:%{name}-all @@ -84,11 +79,7 @@ echo 'member-accessor-module' > src/main/resources/mockito-extensions/org.mockit echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.plugins.MockMaker # see gradle/mockito-core/inline-mock.gradle -%pom_xpath_inject 'pom:project/pom:build/pom:plugins' ' - - org.apache.maven.plugins - maven-antrun-plugin - any +%pom_add_plugin org.apache.maven.plugins:maven-antrun-plugin ' process-classes @@ -103,17 +94,13 @@ echo 'mock-maker-subclass' > src/main/resources/mockito-extensions/org.mockito.p - - - org.apache.maven.plugins - maven-jar-plugin - any +' +%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin ' org/mockito/internal/creation/bytebuddy/inject/*.class - ' %mvn_package :aggregator __noinstall