From 6f79d83f26a27a693186d21fc63b60358ada1f59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 01/15] Switch from %setup to %autosetup --- modello.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modello.spec b/modello.spec index 2a6f02a..d46e036 100644 --- a/modello.spec +++ b/modello.spec @@ -59,8 +59,7 @@ Summary: Javadoc for %{name} API documentation for %{name}. %prep -%setup -q -%patch 0 -p1 +%autosetup -p1 -C cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin From 03c8cd57196a75aaf64f80f4bd65436ea8e15671 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2024 07:57:22 +0200 Subject: [PATCH 02/15] Fix for Sisu 0.9.0.M3 --- modello.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modello.spec b/modello.spec index d46e036..bc87919 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are ASL 2.0. # Some parts of the project are derived from the Exolab project, @@ -86,7 +86,7 @@ cp -p %{SOURCE1} LICENSE %install %mvn_install -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api0:guava:velocity/velocity-engine-core %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:sisu/org.eclipse.sisu.plexus:sisu/org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api0:guava:velocity/velocity-engine-core %{name} true %files -f .mfiles %license LICENSE @@ -96,6 +96,9 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog +* Wed Aug 21 2024 Mikolaj Izdebski - 2.1.2-10 +- Fix for Sisu 0.9.0.M3 + * Wed Jul 24 2024 Mikolaj Izdebski - 2.1.2-9 - Install license files in licensedir instead of docdir From 7879a601d9442ed31b9eaede5f82db71aad9cbb5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 03/15] Switch to non-numdered patches --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index bc87919..a8ef841 100644 --- a/modello.spec +++ b/modello.spec @@ -15,7 +15,7 @@ ExclusiveArch: %{java_arches} noarch Source0: https://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: https://www.apache.org/licenses/LICENSE-2.0.txt -Patch0: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch +Patch: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 8de8091de5ecd1f5916e29fb56df4bbc493c4c8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:15 +0200 Subject: [PATCH 04/15] Convert to %autorelease and %autochangelog --- changelog | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++ modello.spec | 277 +-------------------------------------------------- 2 files changed, 276 insertions(+), 275 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ab10cdb --- /dev/null +++ b/changelog @@ -0,0 +1,274 @@ +* Wed Aug 21 2024 Mikolaj Izdebski - 2.1.2-10 +- Fix for Sisu 0.9.0.M3 + +* Wed Jul 24 2024 Mikolaj Izdebski - 2.1.2-9 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 2.1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 2.1.2-7 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 2.1.2-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 2.1.2-5 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 2.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.1.2-2 +- Convert License tag to SPDX format + +* Mon Aug 28 2023 Mikolaj Izdebski - 2.1.2-1 +- Update to upstream version 2.1.2 + +* Mon Aug 21 2023 Mikolaj Izdebski - 2.1.1-1 +- Update to upstream version 2.1.1 + +* Thu Jul 20 2023 Fedora Release Engineering - 2.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 31 2023 Mikolaj Izdebski - 2.0.0-5 +- Rebuild with no changes + +* Tue Mar 21 2023 Mikolaj Izdebski - 2.0.0-4 +- Port to Google Guice 5 + +* Thu Jan 19 2023 Fedora Release Engineering - 2.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Apr 22 2022 Mikolaj Izdebski - 2.0.0-1 +- Update to upstream version 2.0.0 +- Remove dependency on Jsoup + +* Sat Feb 05 2022 Jiri Vanek - 1.11-8 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.11-5 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 0:1.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0:1.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 0:1.11-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 14 2020 Fabio Valentini - 0:1.11-1 +- Update to version 1.11. + +* Wed Jan 29 2020 Fedora Release Engineering - 0:1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.11-2 +- Mass rebuild for javapackages-tools 201902 + +* Tue Aug 20 2019 Fabio Valentini - 0:1.10.0-1 +- Update to version 1.10.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 26 2019 Marian Koncek - 1.11-1 +- Update to upstream version 1.11 + +* Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 +- Mass rebuild for javapackages-tools 201901 + +* Sat Apr 13 2019 Mikolaj Izdebski - 1.10.0-1 +- Update to upstream version 1.10.0 + +* Fri Feb 01 2019 Fedora Release Engineering - 0:1.9.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Severin Gehwolf - 0:1.9.1-7 +- Add explicit requires on javapackages-tools for modello script. + +* Tue Jul 17 2018 Mikolaj Izdebski - 0:1.9.1-6 +- Allow conditionally building without snakeyaml + +* Fri Jul 13 2018 Fedora Release Engineering - 0:1.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 0:1.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Nov 27 2017 Mikolaj Izdebski - 0:1.9.1-3 +- Contitionally allow building without jackson + +* Wed Jul 26 2017 Fedora Release Engineering - 0:1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 29 2017 Michael Simacek - 0:1.9.1-1 +- Update to upstream version 1.9.1 + +* Fri Feb 10 2017 Fedora Release Engineering - 0:1.8.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jun 15 2016 Mikolaj Izdebski - 0:1.8.3-4 +- Regenerate build-requires +- Remove old obsoletes/provides + +* Thu Feb 04 2016 Fedora Release Engineering - 0:1.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0:1.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Michael Simacek - 0:1.8.3-1 +- Update to upstream version 1.8.3 + +* Mon Nov 3 2014 Mikolaj Izdebski - 0:1.8.2-1 +- Update to upstream version 1.8.2 + +* Sat Jun 07 2014 Fedora Release Engineering - 0:1.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.8.1-4 +- Use Requires: java-headless rebuild (#1067528) + +* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.8.1-3 +- Backport upstream patches for MODELLO-284 and MODELLO-285 + +* Mon Jan 27 2014 Mikolaj Izdebski - 0:1.8.1-2 +- Use Maven 3.x APIs + +* Mon Aug 19 2013 Mikolaj Izdebski - 0:1.8.1-1 +- Update to upstream version 1.8.1 + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 19 2013 Mikolaj Izdebski - 0:1.7-2 +- Build with xmvn +- Use better description +- Simplify build-requires +- Update to current packaging guidelines + +* Thu Feb 21 2013 Mikolaj Izdebski - 0:1.7-1 +- Update to upstream version 1.7 + +* Mon Feb 18 2013 Mikolaj Izdebski - 0:1.6-1 +- Update to upstream version 1.6 + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0:1.5-6 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-5 +- Add JPP depmap for maven-project to override versionless depmap +- Add missing BR/R: maven-project +- Remove unneeded BR: jpa_api + +* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-4 +- Fix license tag +- Install text of Apache license + +* Fri Jul 20 2012 Fedora Release Engineering - 0:1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Aug 8 2011 Alexander Kurtakov 0:1.5-1 +- Update to upstream 1.5. + +* Tue Feb 08 2011 Fedora Release Engineering - 0:1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 26 2011 Alexander Kurtakov 0:1.4.1-1 +- Update to upstream 1.4.1. + +* Wed Dec 1 2010 Stanislav Ochotnicky - 0:1.4-3 +- Fix pom filenames (remove poms of integration tests) Resolves rhbz#655818 +- Use jpackage_script macro to generate script + +* Thu Aug 26 2010 Stanislav Ochotnicky - 0:1.4-2 +- Remove dtdparser BR/R + +* Tue Jul 20 2010 Stanislav Ochotnicky - 0:1.4-1 +- Update to latest upstream version +- Re-enable javadoc generation +- Remove old workarounds/patches + +* Mon May 24 2010 Yong Yang 1.1-2 +- Fix JPP pom name +- Disable javadoc:javadoc due to the failure of maven-doxia + +* Mon May 24 2010 Yong Yang 1.1-1 +- Upgrade to 1.1 + +* Fri May 21 2010 Yong Yang 1.0.1-1 +- Upgrade to 1.0.1 + +* Thu Aug 20 2009 Andrew Overholt 1.0-0.4.a15.0.1 +- Update to alpha 15 courtesy Deepak Bhole + +* Sat Jul 25 2009 Fedora Release Engineering - 0:1.0-0.3.a8.4.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.0-0.2.a8.4.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a8.4.4 +- drop repotag + +* Tue Mar 20 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.3 +- disable gcj support + +* Tue Mar 13 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.2 +- Change license to MIT to reflex the actual license specified in the + source headers. +- fix various rpmlint issues + +* Mon Feb 26 2007 Tania Bento 0:1.0-0.1.a8.4jpp.1 +- Fixed %%Release. +- Fixed %%License. +- Fixed %%BuildRoot. +- Removed %%Vendor. +- Removed %%Distribution. +- Defined _with_gcj_support and gcj_support. +- Fixed instructions on how to generate the source drop. + +* Fri Dec 01 2006 Deepak Bhole 1.0-0.a8.4jpp +- Added an obsoletes for older versions of the plugin + +* Thu Oct 19 2006 Deepak Bhole 1.0-0.a8.3jpp +- Update for maven2 9jpp +- Merge maven-plugin subpackage into the main one + +* Mon Sep 11 2006 Ralph Apel - 0:1.0-0.a8.2jpp +- Add gcj_support option +- Add post/postun Requires for javadoc +- Don't omit maven-plugin upload + +* Fri Jun 23 2006 Deepak Bhole - 0:1.0-0.a8.1jpp +- Upgrade to 1.0-alpha-8 +- Remove ant build, add maven2 build + +* Thu Jun 01 2006 Fernando Nasser - 0:1.0-0.a4.2jpp +- First JPP 1.7 build + +* Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a4.1jpp +- First JPackage build diff --git a/modello.spec b/modello.spec index a8ef841..be336bb 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 10%{?dist} +Release: %autorelease Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are ASL 2.0. # Some parts of the project are derived from the Exolab project, @@ -96,277 +96,4 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog -* Wed Aug 21 2024 Mikolaj Izdebski - 2.1.2-10 -- Fix for Sisu 0.9.0.M3 - -* Wed Jul 24 2024 Mikolaj Izdebski - 2.1.2-9 -- Install license files in licensedir instead of docdir - -* Thu Jul 18 2024 Fedora Release Engineering - 2.1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri May 31 2024 Mikolaj Izdebski - 2.1.2-7 -- Switch to a newer patch macro syntax - -* Tue Feb 27 2024 Jiri Vanek - 2.1.2-6 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 2.1.2-5 -- bump of release for for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 2.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 2.1.2-2 -- Convert License tag to SPDX format - -* Mon Aug 28 2023 Mikolaj Izdebski - 2.1.2-1 -- Update to upstream version 2.1.2 - -* Mon Aug 21 2023 Mikolaj Izdebski - 2.1.1-1 -- Update to upstream version 2.1.1 - -* Thu Jul 20 2023 Fedora Release Engineering - 2.0.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Mar 31 2023 Mikolaj Izdebski - 2.0.0-5 -- Rebuild with no changes - -* Tue Mar 21 2023 Mikolaj Izdebski - 2.0.0-4 -- Port to Google Guice 5 - -* Thu Jan 19 2023 Fedora Release Engineering - 2.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Apr 22 2022 Mikolaj Izdebski - 2.0.0-1 -- Update to upstream version 2.0.0 -- Remove dependency on Jsoup - -* Sat Feb 05 2022 Jiri Vanek - 1.11-8 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.11-5 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 0:1.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0:1.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 0:1.11-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu May 14 2020 Fabio Valentini - 0:1.11-1 -- Update to version 1.11. - -* Wed Jan 29 2020 Fedora Release Engineering - 0:1.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.11-2 -- Mass rebuild for javapackages-tools 201902 - -* Tue Aug 20 2019 Fabio Valentini - 0:1.10.0-1 -- Update to version 1.10.0. - -* Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 26 2019 Marian Koncek - 1.11-1 -- Update to upstream version 1.11 - -* Fri May 24 2019 Mikolaj Izdebski - 1.10.0-2 -- Mass rebuild for javapackages-tools 201901 - -* Sat Apr 13 2019 Mikolaj Izdebski - 1.10.0-1 -- Update to upstream version 1.10.0 - -* Fri Feb 01 2019 Fedora Release Engineering - 0:1.9.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Severin Gehwolf - 0:1.9.1-7 -- Add explicit requires on javapackages-tools for modello script. - -* Tue Jul 17 2018 Mikolaj Izdebski - 0:1.9.1-6 -- Allow conditionally building without snakeyaml - -* Fri Jul 13 2018 Fedora Release Engineering - 0:1.9.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 0:1.9.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Nov 27 2017 Mikolaj Izdebski - 0:1.9.1-3 -- Contitionally allow building without jackson - -* Wed Jul 26 2017 Fedora Release Engineering - 0:1.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 29 2017 Michael Simacek - 0:1.9.1-1 -- Update to upstream version 1.9.1 - -* Fri Feb 10 2017 Fedora Release Engineering - 0:1.8.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Jun 15 2016 Mikolaj Izdebski - 0:1.8.3-4 -- Regenerate build-requires -- Remove old obsoletes/provides - -* Thu Feb 04 2016 Fedora Release Engineering - 0:1.8.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0:1.8.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 26 2015 Michael Simacek - 0:1.8.3-1 -- Update to upstream version 1.8.3 - -* Mon Nov 3 2014 Mikolaj Izdebski - 0:1.8.2-1 -- Update to upstream version 1.8.2 - -* Sat Jun 07 2014 Fedora Release Engineering - 0:1.8.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.8.1-4 -- Use Requires: java-headless rebuild (#1067528) - -* Tue Feb 18 2014 Mikolaj Izdebski - 0:1.8.1-3 -- Backport upstream patches for MODELLO-284 and MODELLO-285 - -* Mon Jan 27 2014 Mikolaj Izdebski - 0:1.8.1-2 -- Use Maven 3.x APIs - -* Mon Aug 19 2013 Mikolaj Izdebski - 0:1.8.1-1 -- Update to upstream version 1.8.1 - -* Sat Aug 03 2013 Fedora Release Engineering - 0:1.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Apr 19 2013 Mikolaj Izdebski - 0:1.7-2 -- Build with xmvn -- Use better description -- Simplify build-requires -- Update to current packaging guidelines - -* Thu Feb 21 2013 Mikolaj Izdebski - 0:1.7-1 -- Update to upstream version 1.7 - -* Mon Feb 18 2013 Mikolaj Izdebski - 0:1.6-1 -- Update to upstream version 1.6 - -* Thu Feb 14 2013 Fedora Release Engineering - 0:1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 0:1.5-6 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-5 -- Add JPP depmap for maven-project to override versionless depmap -- Add missing BR/R: maven-project -- Remove unneeded BR: jpa_api - -* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-4 -- Fix license tag -- Install text of Apache license - -* Fri Jul 20 2012 Fedora Release Engineering - 0:1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0:1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Aug 8 2011 Alexander Kurtakov 0:1.5-1 -- Update to upstream 1.5. - -* Tue Feb 08 2011 Fedora Release Engineering - 0:1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jan 26 2011 Alexander Kurtakov 0:1.4.1-1 -- Update to upstream 1.4.1. - -* Wed Dec 1 2010 Stanislav Ochotnicky - 0:1.4-3 -- Fix pom filenames (remove poms of integration tests) Resolves rhbz#655818 -- Use jpackage_script macro to generate script - -* Thu Aug 26 2010 Stanislav Ochotnicky - 0:1.4-2 -- Remove dtdparser BR/R - -* Tue Jul 20 2010 Stanislav Ochotnicky - 0:1.4-1 -- Update to latest upstream version -- Re-enable javadoc generation -- Remove old workarounds/patches - -* Mon May 24 2010 Yong Yang 1.1-2 -- Fix JPP pom name -- Disable javadoc:javadoc due to the failure of maven-doxia - -* Mon May 24 2010 Yong Yang 1.1-1 -- Upgrade to 1.1 - -* Fri May 21 2010 Yong Yang 1.0.1-1 -- Upgrade to 1.0.1 - -* Thu Aug 20 2009 Andrew Overholt 1.0-0.4.a15.0.1 -- Update to alpha 15 courtesy Deepak Bhole - -* Sat Jul 25 2009 Fedora Release Engineering - 0:1.0-0.3.a8.4.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:1.0-0.2.a8.4.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-0.1.a8.4.4 -- drop repotag - -* Tue Mar 20 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.3 -- disable gcj support - -* Tue Mar 13 2007 Matt Wringe 0:1.0-0.1.a8.4jpp.2 -- Change license to MIT to reflex the actual license specified in the - source headers. -- fix various rpmlint issues - -* Mon Feb 26 2007 Tania Bento 0:1.0-0.1.a8.4jpp.1 -- Fixed %%Release. -- Fixed %%License. -- Fixed %%BuildRoot. -- Removed %%Vendor. -- Removed %%Distribution. -- Defined _with_gcj_support and gcj_support. -- Fixed instructions on how to generate the source drop. - -* Fri Dec 01 2006 Deepak Bhole 1.0-0.a8.4jpp -- Added an obsoletes for older versions of the plugin - -* Thu Oct 19 2006 Deepak Bhole 1.0-0.a8.3jpp -- Update for maven2 9jpp -- Merge maven-plugin subpackage into the main one - -* Mon Sep 11 2006 Ralph Apel - 0:1.0-0.a8.2jpp -- Add gcj_support option -- Add post/postun Requires for javadoc -- Don't omit maven-plugin upload - -* Fri Jun 23 2006 Deepak Bhole - 0:1.0-0.a8.1jpp -- Upgrade to 1.0-alpha-8 -- Remove ant build, add maven2 build - -* Thu Jun 01 2006 Fernando Nasser - 0:1.0-0.a4.2jpp -- First JPP 1.7 build - -* Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a4.1jpp -- First JPackage build +%autochangelog From 122724c97aec81ca506005bf9555bff87415929c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:50:57 +0100 Subject: [PATCH 05/15] Drop explicit requires on javapackages-tools --- modello.spec | 4 ---- plans/javapackages.fmf | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modello.spec b/modello.spec index be336bb..2685fc0 100644 --- a/modello.spec +++ b/modello.spec @@ -39,10 +39,6 @@ BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) %endif -# Explicit javapackages-tools requires since modello script uses -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - %description Modello is a Data Model toolkit in use by the Apache Maven Project. 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 7c38f3ec432c42c8f7d346eca7f5078a8c5e9c37 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 06/15] Unify spec style with the rest of Java/Maven packages [skip changelog] --- modello.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modello.spec b/modello.spec index 2685fc0..6ab8a63 100644 --- a/modello.spec +++ b/modello.spec @@ -48,10 +48,10 @@ architecture, various types of code and descriptors can be generated from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. -%package javadoc +%package javadoc Summary: Javadoc for %{name} -%description javadoc +%description javadoc API documentation for %{name}. %prep From 711d3eb7f2fabb1c2eb6f6c249d4692e1a88b1fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 07/15] Update javadoc package description [skip changelog] --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 6ab8a63..d3be2d7 100644 --- a/modello.spec +++ b/modello.spec @@ -49,7 +49,7 @@ from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc API documentation for %{name}. From 8257241a188d998e5058eea8271f8ce045b1e572 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 18:56:38 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ec91e3d1842e57ca59991d51048bd088ce8fe32b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 09/15] Remove javadoc subpackage --- modello.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/modello.spec b/modello.spec index d3be2d7..bcce52b 100644 --- a/modello.spec +++ b/modello.spec @@ -38,6 +38,8 @@ BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.1.2-23 %description Modello is a Data Model toolkit in use by the Apache Maven Project. @@ -48,12 +50,6 @@ architecture, various types of code and descriptors can be generated from the single model, including Java POJOs, XML marshallers/unmarshallers, XSD and documentation. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C cp -p %{SOURCE1} LICENSE @@ -77,7 +73,7 @@ cp -p %{SOURCE1} LICENSE %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) -%mvn_build -f +%mvn_build -j -f %install %mvn_install @@ -88,8 +84,5 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %{_bindir}/modello -%files javadoc -f .mfiles-javadoc -%license LICENSE - %changelog %autochangelog From 1cb821163d08f4df30a5f84eb385acd7de0cd3d8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 10/15] 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 0738829a990dcf8026483a1ecb252a888fd7fff2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 11/15] 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 d25b4f7b4e616ce578555b2e4b746bdcd4795700 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 12/15] Build with OpenJDK 25 --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index bcce52b..1d7e73d 100644 --- a/modello.spec +++ b/modello.spec @@ -20,7 +20,7 @@ Patch: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.google.inject:guice) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) From e328efa087a95c824137e40492eec051f86e5076 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:16:16 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a9917963dc282940b79dc409b2afee0c93149652 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:44:08 +0200 Subject: [PATCH 14/15] 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 390ceefb42482daa58795903a8c0542083e6c610 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 9 Sep 2025 12:24:10 +0200 Subject: [PATCH 15/15] Remove build-dependency on maven-enforcer-plugin --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 1d7e73d..ff2325f 100644 --- a/modello.spec +++ b/modello.spec @@ -24,7 +24,6 @@ BuildRequires: maven-local-openjdk25 BuildRequires: mvn(com.google.inject:guice) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) @@ -55,6 +54,7 @@ marshallers/unmarshallers, XSD and documentation. cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_dep :plexus-xml modello-core %pom_remove_dep :sisu-guice modello-core