From 9021b588019f1573b1be6e2ba77429b35601e24b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:19:00 +0000 Subject: [PATCH 01/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 37bd529..ee1c01f 100644 --- a/modello.spec +++ b/modello.spec @@ -3,7 +3,7 @@ Name: modello Version: 1.9.1 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are @@ -94,6 +94,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* 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. From 3e482ca4841a5268b091f82adf06d0a98661bbc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:33:01 +0000 Subject: [PATCH 02/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index ee1c01f..b3d1a6c 100644 --- a/modello.spec +++ b/modello.spec @@ -3,7 +3,7 @@ Name: modello Version: 1.9.1 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are @@ -94,6 +94,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0:1.9.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 68a0f6ea14c997a0c7218bb2247f170dea6dfe8b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 20 Aug 2019 10:56:25 +0200 Subject: [PATCH 03/62] update to version 1.10.0 --- .gitignore | 17 ++++++++++------- modello.spec | 30 ++++++++++++++++++++++-------- sources | 2 +- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 361710a..60bdda0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,12 @@ -modello-1.0-alpha-15-src.tar.gz -modello-1.0.1-src.tar.gz -modello-1.1-src.tar.gz -modello-1.4-src.tar.xz -modello-1.4.1-source-release.zip -modello-1.5-source-release.zip -/.project +/results_* +/*.src.rpm + +/modello-1.0-alpha-15-src.tar.gz +/modello-1.0.1-src.tar.gz +/modello-1.1-src.tar.gz +/modello-1.4-src.tar.xz +/modello-1.4.1-source-release.zip +/modello-1.5-source-release.zip /modello-1.6-source-release.zip /LICENSE-2.0.txt /modello-1.7-source-release.zip @@ -12,3 +14,4 @@ modello-1.5-source-release.zip /modello-1.8.2-source-release.zip /modello-1.8.3-source-release.zip /modello-1.9.1-source-release.zip +/modello-1.10.0-source-release.zip diff --git a/modello.spec b/modello.spec index b3d1a6c..cc6ffbe 100644 --- a/modello.spec +++ b/modello.spec @@ -2,13 +2,13 @@ %bcond_without snakeyaml Name: modello -Version: 1.9.1 -Release: 9%{?dist} -Epoch: 0 Summary: Modello Data Model toolkit -# The majority of files are under MIT license, but some of them are -# ASL 2.0 or BSD-licensed. -License: ASL 2.0 and BSD and MIT +Epoch: 0 +Version: 1.10.0 +Release: 1%{?dist} +# The majority of files are under MIT license, but some of them are ASL 2.0. +License: MIT and ASL 2.0 + URL: http://codehaus-plexus.github.io/modello Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip Source1: http://www.apache.org/licenses/LICENSE-2.0.txt @@ -29,14 +29,17 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) + %if %{with jackson} BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) %endif + %if %{with snakeyaml} BuildRequires: mvn(org.yaml:snakeyaml) %endif + # Explicit javapackages-tools requires since modello script uses # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -51,17 +54,20 @@ 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 %setup -q cp -p %{SOURCE1} LICENSE + # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin + # Avoid using Maven 2.x APIs sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml @@ -77,15 +83,18 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin %endif + %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) %mvn_build -f -- -Dmaven.version=3.1.1 + %install %mvn_install %jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true + %files -f .mfiles %doc LICENSE %{_bindir}/* @@ -93,7 +102,11 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files javadoc -f .mfiles-javadoc %doc LICENSE + %changelog +* 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 @@ -273,3 +286,4 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml * Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a4.1jpp - First JPackage build + diff --git a/sources b/sources index 20b5bb2..56fe3b3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.9.1-source-release.zip) = 4b4f31c1e86280d72d503b8c1bcaf780bdb4d8e95545c9bce0a9a77b17d58febed27c72b545ebb57adfde78ee538eaf7055eca19ac45c94cdcdccb853236ea7f +SHA512 (modello-1.10.0-source-release.zip) = eda3264c5e33c1e19117d79bdf5560d639c2510ef8c857b5089eeac9b2dc4706197419802c191cc2691f9bda4380324602d57b973ad6fd19413a198c1add5373 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 197da3a2e5ccb77b84266bf159428ffb216dba44 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 27 Aug 2019 12:28:19 +0200 Subject: [PATCH 04/62] fix License tag See: https://src.fedoraproject.org/rpms/modello/pull-request/1#comment-29587 --- modello.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index cc6ffbe..ba36320 100644 --- a/modello.spec +++ b/modello.spec @@ -7,7 +7,9 @@ Epoch: 0 Version: 1.10.0 Release: 1%{?dist} # The majority of files are under MIT license, but some of them are ASL 2.0. -License: MIT and ASL 2.0 +# Some parts of the project are derived from the Exolab project, +# and are licensed under a 5-clause BSD license. +License: MIT and ASL 2.0 and BSD URL: http://codehaus-plexus.github.io/modello Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip From 1bbed93618aee386d4b889e2ed1ac79a55fdacdd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 13:53:24 +0000 Subject: [PATCH 05/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index ba36320..63dd1eb 100644 --- a/modello.spec +++ b/modello.spec @@ -5,7 +5,7 @@ Name: modello Summary: Modello Data Model toolkit Epoch: 0 Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} # 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, # and are licensed under a 5-clause BSD license. @@ -106,6 +106,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0:1.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 20 2019 Fabio Valentini - 0:1.10.0-1 - Update to version 1.10.0. From 40ce3b8a773f82e104012aae6342d7b52a8f09b7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 14 May 2020 10:50:43 +0200 Subject: [PATCH 06/62] update to version 1.11 --- .gitignore | 1 + modello.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 60bdda0..e45dd64 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /modello-1.8.3-source-release.zip /modello-1.9.1-source-release.zip /modello-1.10.0-source-release.zip +/modello-1.11-source-release.zip diff --git a/modello.spec b/modello.spec index 63dd1eb..cac98fb 100644 --- a/modello.spec +++ b/modello.spec @@ -4,8 +4,8 @@ Name: modello Summary: Modello Data Model toolkit Epoch: 0 -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.11 +Release: 1%{?dist} # 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, # and are licensed under a 5-clause BSD license. @@ -87,7 +87,7 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %build -# skip tests because we have too old xmlunit in Fedora now (1.0.8) +# FIXME: tests fail %mvn_build -f -- -Dmaven.version=3.1.1 @@ -99,13 +99,16 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files -f .mfiles %doc LICENSE -%{_bindir}/* +%{_bindir}/modello %files javadoc -f .mfiles-javadoc %doc LICENSE %changelog +* 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 @@ -291,4 +294,3 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml * Mon Nov 07 2005 Ralph Apel - 0:1.0-0.a4.1jpp - First JPackage build - diff --git a/sources b/sources index 56fe3b3..1662ad4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.10.0-source-release.zip) = eda3264c5e33c1e19117d79bdf5560d639c2510ef8c857b5089eeac9b2dc4706197419802c191cc2691f9bda4380324602d57b973ad6fd19413a198c1add5373 +SHA512 (modello-1.11-source-release.zip) = e7731a80cc1112405a4e8746713eb9d0d81bf7a00bb13fb615bc63196513579b956f9dff56d963e16c3e6c7c9cd651954922fb62541765e86b0ace0fa9b8450f SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 797b359337f8d2ddbd1c2705849d0231a8be5433 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 03:02:00 +0200 Subject: [PATCH 07/62] Rebuilt for JDK-11 --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index cac98fb..fd4ac84 100644 --- a/modello.spec +++ b/modello.spec @@ -5,7 +5,7 @@ Name: modello Summary: Modello Data Model toolkit Epoch: 0 Version: 1.11 -Release: 1%{?dist} +Release: 2%{?dist} # 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, # and are licensed under a 5-clause BSD license. @@ -106,6 +106,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %changelog +* 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. From 239b3af225bffcba47f91b67f686b04590450fae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:19:21 +0000 Subject: [PATCH 08/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index fd4ac84..8298bc2 100644 --- a/modello.spec +++ b/modello.spec @@ -5,7 +5,7 @@ Name: modello Summary: Modello Data Model toolkit Epoch: 0 Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} # 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, # and are licensed under a 5-clause BSD license. @@ -106,6 +106,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %changelog +* 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 From de26774541d95661bbf4066971c6b9b0d14fb301 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:42:31 +0000 Subject: [PATCH 09/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 8298bc2..c34d388 100644 --- a/modello.spec +++ b/modello.spec @@ -5,7 +5,7 @@ Name: modello Summary: Modello Data Model toolkit Epoch: 0 Version: 1.11 -Release: 3%{?dist} +Release: 4%{?dist} # 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, # and are licensed under a 5-clause BSD license. @@ -106,6 +106,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %changelog +* 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 From 1407e72333141fbe4d23a62393c31e123a2e9c47 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 10/62] Conditionalize buildrequires in bootstrap mode --- modello.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modello.spec b/modello.spec index b6cbf9a..6875d90 100644 --- a/modello.spec +++ b/modello.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: modello Version: 1.11 Release: 2%{?dist} @@ -12,6 +14,9 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) @@ -25,6 +30,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) 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 From e8ccf7a4f45ba489dcd89dd876ced10b11b8441d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 11/62] Turn off bootstrap mode by default --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 6875d90..8e0b373 100644 --- a/modello.spec +++ b/modello.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: modello Version: 1.11 From e5b9047d7495f6b02529fa48bc391db646011bf2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:50:26 +0200 Subject: [PATCH 12/62] Bootstrap build --- modello.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modello.spec b/modello.spec index a73ca7d..1d3732e 100644 --- a/modello.spec +++ b/modello.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: modello Version: 1.11 -Release: 4%{?dist} +Release: 5%{?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,6 +86,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.11-5 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 0:1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ca196e7386d9553704bef84fc0c54bdfda3365a1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:47 +0200 Subject: [PATCH 13/62] Non-bootstrap build --- modello.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 1d3732e..ca4f9cc 100644 --- a/modello.spec +++ b/modello.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: modello Version: 1.11 @@ -88,6 +88,7 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %changelog * 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 From 32ecca02ec35fdf016cd164f6d51140b9e5deb0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:15:41 +0000 Subject: [PATCH 14/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index ca4f9cc..b1d9dd2 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 1.11 -Release: 5%{?dist} +Release: 6%{?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,6 +86,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* 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 From 2d3ed9d99781718e9c7ef55c81f0b94ddd172c9d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jan 2022 10:03:32 +0100 Subject: [PATCH 15/62] Module javapackages-tools stream 202001 was retired --- .gitignore | 16 ---- dead.package | 1 + modello.spec | 264 --------------------------------------------------- sources | 2 - 4 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 modello.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 64cc695..0000000 --- a/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -modello-1.0-alpha-15-src.tar.gz -modello-1.0.1-src.tar.gz -modello-1.1-src.tar.gz -modello-1.4-src.tar.xz -modello-1.4.1-source-release.zip -modello-1.5-source-release.zip -/.project -/modello-1.6-source-release.zip -/LICENSE-2.0.txt -/modello-1.7-source-release.zip -/modello-1.8.1-source-release.zip -/modello-1.8.2-source-release.zip -/modello-1.8.3-source-release.zip -/modello-1.9.1-source-release.zip -/modello-1.10.0-source-release.zip -/modello-1.11-source-release.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..78f11b3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Module javapackages-tools stream 202001 was retired diff --git a/modello.spec b/modello.spec deleted file mode 100644 index b6cbf9a..0000000 --- a/modello.spec +++ /dev/null @@ -1,264 +0,0 @@ -Name: modello -Version: 1.11 -Release: 2%{?dist} -Summary: Modello Data Model toolkit -# The majority of files are under MIT license, but some of them are -# ASL 2.0 or BSD-licensed. -License: ASL 2.0 and BSD and MIT -URL: http://codehaus-plexus.github.io/modello -Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt - -BuildArch: noarch - -BuildRequires: maven-local -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-model) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) -BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.jsoup:jsoup) -BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) -# 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. - -Modello is a framework for code generation from a simple model. -Modello generates code from a simple model format based on a plugin -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: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. - -%prep -%setup -q -cp -p %{SOURCE1} LICENSE -# We don't generate site; don't pull extra dependencies. -%pom_remove_plugin :maven-site-plugin -# Avoid using Maven 2.x APIs -sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml - -%pom_disable_module modello-plugin-jackson modello-plugins -%pom_disable_module modello-plugin-jsonschema modello-plugins -%pom_remove_dep :modello-plugin-jackson modello-maven-plugin -%pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin - -%pom_disable_module modello-plugin-snakeyaml modello-plugins -%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin - -%build -# skip tests because we have too old xmlunit in Fedora now (1.0.8) -%mvn_build -f -- -Dmaven.version=3.1.1 - -%install -%mvn_install - -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true - -%files -f .mfiles -%doc LICENSE -%{_bindir}/modello - -%files javadoc -f .mfiles-javadoc -%doc LICENSE - -%changelog -* Tue Nov 05 2019 Mikolaj Izdebski - 1.11-2 -- Mass rebuild for javapackages-tools 201902 - -* 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 - -* 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/sources b/sources deleted file mode 100644 index 1662ad4..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (modello-1.11-source-release.zip) = e7731a80cc1112405a4e8746713eb9d0d81bf7a00bb13fb615bc63196513579b956f9dff56d963e16c3e6c7c9cd651954922fb62541765e86b0ace0fa9b8450f -SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 19f5323b8e97253358c15dccc41e5a24ee2cfd5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:17:44 +0000 Subject: [PATCH 16/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index b1d9dd2..57892c1 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 1.11 -Release: 6%{?dist} +Release: 7%{?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,6 +86,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* 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 From 931f64e6ff6cb113cebd8b729588130b1081b2e9 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 23:02:37 +0100 Subject: [PATCH 17/62] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 57892c1..f598fe2 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 1.11 -Release: 7%{?dist} +Release: 8%{?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,6 +86,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* 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 From 19efb81bb33276773f319bfe099c2a9db27ce066 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 22 Apr 2022 16:52:42 +0200 Subject: [PATCH 18/62] Onboard package into gating --- .fmf/version | 1 + gating.yaml | 8 ++++++++ plans/smoke.fmf | 14 ++++++++++++++ plans/smoke.mdo | 26 ++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/smoke.fmf create mode 100644 plans/smoke.mdo 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/gating.yaml b/gating.yaml new file mode 100644 index 0000000..05d1cc5 --- /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.tier0.functional} diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..ac76cfe --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,14 @@ +summary: Basic smoke test +prepare: + how: install + package: java-11-openjdk-devel +execute: + script: | + set -x + modello plans/smoke.mdo java test-src 1.0.0 foo true + javac -d test-bin test-src/smoke/* + modello plans/smoke.mdo stax-reader test-src 1.0.0 foo true + javac -d test-bin -cp test-bin test-src/smoke/io/stax/* + find test-src test-bin + test -f test-bin/smoke/SomeBean.class + test -f test-bin/smoke/io/stax/SmokeStaxReader.class diff --git a/plans/smoke.mdo b/plans/smoke.mdo new file mode 100644 index 0000000..48d1325 --- /dev/null +++ b/plans/smoke.mdo @@ -0,0 +1,26 @@ + + smoke + Smoke + Smoke test + + + package + smoke + + + + + SomeBean + 1.0.0+ + Ordinary bean + + + f + 1.0.0+ + A boolean field + Boolean + + + + + From 914fee37b7ac714911f2d09a7b3abf3e61993696 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 22 Apr 2022 15:03:00 +0200 Subject: [PATCH 19/62] Update to upstream version 2.0.0 --- .gitignore | 1 + modello.spec | 29 ++++++++++++++++------------- plans/smoke.fmf | 4 ++-- sources | 2 +- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index e45dd64..72469a3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /modello-1.9.1-source-release.zip /modello-1.10.0-source-release.zip /modello-1.11-source-release.zip +/modello-2.0.0-source-release.zip diff --git a/modello.spec b/modello.spec index f598fe2..ee9b3f6 100644 --- a/modello.spec +++ b/modello.spec @@ -1,17 +1,17 @@ %bcond_with bootstrap Name: modello -Version: 1.11 -Release: 8%{?dist} +Version: 2.0.0 +Release: 1%{?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, # and are licensed under a 5-clause BSD license. License: MIT and ASL 2.0 and BSD -URL: http://codehaus-plexus.github.io/modello -Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +URL: https://codehaus-plexus.github.io/modello +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 BuildArch: noarch @@ -20,18 +20,19 @@ BuildRequires: maven-local BuildRequires: javapackages-bootstrap %else BuildRequires: mvn(junit:junit) +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-plugin-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) %endif # Explicit javapackages-tools requires since modello script uses @@ -58,9 +59,8 @@ API documentation for %{name}. cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin -# Avoid using Maven 2.x APIs -sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml +%pom_remove_dep :jackson-bom %pom_disable_module modello-plugin-jackson modello-plugins %pom_disable_module modello-plugin-jsonschema modello-plugins %pom_remove_dep :modello-plugin-jackson modello-maven-plugin @@ -71,12 +71,12 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) -%mvn_build -f -- -Dmaven.version=3.1.1 +%mvn_build -f %install %mvn_install -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice-no_aop:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true %files -f .mfiles %doc LICENSE @@ -86,6 +86,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* Fri Apr 22 2022 Mikolaj Izdebski - 2.0.0-1 +- Update to upstream version 2.0.0 + * Sat Feb 05 2022 Jiri Vanek - 1.11-8 - Rebuilt for java-17-openjdk as system jdk diff --git a/plans/smoke.fmf b/plans/smoke.fmf index ac76cfe..b016e0b 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -5,9 +5,9 @@ prepare: execute: script: | set -x - modello plans/smoke.mdo java test-src 1.0.0 foo true + modello plans/smoke.mdo java test-src 1.0.0 foo 8 javac -d test-bin test-src/smoke/* - modello plans/smoke.mdo stax-reader test-src 1.0.0 foo true + modello plans/smoke.mdo stax-reader test-src 1.0.0 foo 8 javac -d test-bin -cp test-bin test-src/smoke/io/stax/* find test-src test-bin test -f test-bin/smoke/SomeBean.class diff --git a/sources b/sources index 1662ad4..962387a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-1.11-source-release.zip) = e7731a80cc1112405a4e8746713eb9d0d81bf7a00bb13fb615bc63196513579b956f9dff56d963e16c3e6c7c9cd651954922fb62541765e86b0ace0fa9b8450f +SHA512 (modello-2.0.0-source-release.zip) = 69934156fe0e1eab6ef26f02e87b0aab0de2c74642f2cd93ca8556004f918643f578449c9d322b0388d9ff6730f83265a72592cab7544095d11042aacab285a3 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 1e3b2371f635a9e8e436514587b0cb9d273056b4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 22 Apr 2022 18:27:02 +0200 Subject: [PATCH 20/62] Remove dependency on Jsoup --- 0001-Remove-dependency-on-Jsoup.patch | 52 +++++++++++++++++++++++++++ modello.spec | 7 ++-- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 0001-Remove-dependency-on-Jsoup.patch diff --git a/0001-Remove-dependency-on-Jsoup.patch b/0001-Remove-dependency-on-Jsoup.patch new file mode 100644 index 0000000..4b0b20d --- /dev/null +++ b/0001-Remove-dependency-on-Jsoup.patch @@ -0,0 +1,52 @@ +From 12cc1a306dc83b9bd6b49486e0c2e7403c569f40 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Fri, 22 Apr 2022 18:25:53 +0200 +Subject: [PATCH] Remove dependency on Jsoup + +--- + modello-plugins/modello-plugin-xdoc/pom.xml | 5 ----- + .../org/codehaus/modello/plugin/xdoc/XdocGenerator.java | 6 +----- + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/modello-plugins/modello-plugin-xdoc/pom.xml b/modello-plugins/modello-plugin-xdoc/pom.xml +index 8e6705ad..2d3ad6b5 100644 +--- a/modello-plugins/modello-plugin-xdoc/pom.xml ++++ b/modello-plugins/modello-plugin-xdoc/pom.xml +@@ -27,11 +27,6 @@ + org.codehaus.plexus + plexus-utils + +- +- org.jsoup +- jsoup +- 1.14.3 +- + + org.xmlunit + xmlunit-core +diff --git a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java +index ad3bc2d1..5ff5b952 100644 +--- a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java ++++ b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java +@@ -56,8 +56,6 @@ import org.codehaus.plexus.util.StringUtils; + import org.codehaus.plexus.util.WriterFactory; + import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter; + import org.codehaus.plexus.util.xml.XMLWriter; +-import org.jsoup.Jsoup; +-import org.jsoup.nodes.Document; + + /** + * @author Jason van Zyl +@@ -787,8 +785,6 @@ public class XdocGenerator + */ + private static String rewrite( String text ) + { +- Document document = Jsoup.parseBodyFragment( text ); +- document.outputSettings().syntax( Document.OutputSettings.Syntax.xml ); +- return document.body().html(); ++ return text; + } + } +-- +2.35.1 + diff --git a/modello.spec b/modello.spec index ee9b3f6..c39f191 100644 --- a/modello.spec +++ b/modello.spec @@ -8,11 +8,13 @@ Summary: Modello Data Model toolkit # Some parts of the project are derived from the Exolab project, # and are licensed under a 5-clause BSD license. License: MIT and ASL 2.0 and BSD - URL: https://codehaus-plexus.github.io/modello + 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-Remove-dependency-on-Jsoup.patch + BuildArch: noarch BuildRequires: maven-local @@ -30,7 +32,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) -BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) %endif @@ -56,6 +57,7 @@ API documentation for %{name}. %prep %setup -q +%patch0 -p1 cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin @@ -88,6 +90,7 @@ cp -p %{SOURCE1} LICENSE %changelog * 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 From cd9740b54bc4767ce07d6a7f4209fc1d0ee4bad6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 May 2022 15:25:37 +0200 Subject: [PATCH 21/62] Update test configuration --- ci.fmf | 1 + gating.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 ci.fmf 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/gating.yaml b/gating.yaml index 05d1cc5..8653363 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,4 +5,4 @@ decision_contexts: - bodhi_update_push_testing - bodhi_update_push_stable rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} From 4772915c143972b36ecb5487771b1e0a67f68166 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 22/62] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- modello.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/modello.spec b/modello.spec index c39f191..de00940 100644 --- a/modello.spec +++ b/modello.spec @@ -16,6 +16,7 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Patch0: 0001-Remove-dependency-on-Jsoup.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: maven-local %if %{with bootstrap} From 79be30791f2ab12cc78e87bb5c7d225f64573455 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 23/62] Update build-requires in bootstrap mode --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index de00940..fa47b9d 100644 --- a/modello.spec +++ b/modello.spec @@ -18,10 +18,10 @@ Patch0: 0001-Remove-dependency-on-Jsoup.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) From 7d8a1edf1b21a6a121e84fa583872bfda97f6a5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:36:28 +0000 Subject: [PATCH 24/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index fa47b9d..6cee2ee 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?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, @@ -89,6 +89,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 040ffc202eec791a9e9b0355a7b6ba75e02601e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Aug 2022 17:45:56 +0200 Subject: [PATCH 25/62] Add javapackages test plan --- gating.yaml | 1 + plans/javapackages.fmf | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 plans/javapackages.fmf diff --git a/gating.yaml b/gating.yaml index 8653363..7b6e38f 100644 --- a/gating.yaml +++ b/gating.yaml @@ -6,3 +6,4 @@ decision_contexts: - bodhi_update_push_stable rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..d89ae51 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,6 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://pagure.io/javapackages-validator-tests +execute: + how: tmt From 25e03b2e223463ac24e2f1b219517cdb34186869 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 07:44:26 +0200 Subject: [PATCH 26/62] Update javapackages test plan --- plans/javapackages.fmf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index d89ae51..8f6c9cb 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,6 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://pagure.io/javapackages-validator-tests + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 execute: how: tmt From 9031b9c2ea382a6f62cee4efdcf95895115478e2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 09:38:51 +0200 Subject: [PATCH 27/62] Refactor smoke test --- plans/smoke.fmf | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/plans/smoke.fmf b/plans/smoke.fmf index b016e0b..72ff510 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,14 +1,20 @@ summary: Basic smoke test +discover: + how: shell + tests: + - name: /smoke/generate-stax-reader + test: | + set -x + PATH=/usr/lib/jvm/java-11-openjdk/bin:${PATH} + modello plans/smoke.mdo java test-src 1.0.0 foo 8 + javac -d test-bin test-src/smoke/* + modello plans/smoke.mdo stax-reader test-src 1.0.0 foo 8 + javac -d test-bin -cp test-bin test-src/smoke/io/stax/* + find test-src test-bin + test -f test-bin/smoke/SomeBean.class + test -f test-bin/smoke/io/stax/SmokeStaxReader.class prepare: how: install package: java-11-openjdk-devel execute: - script: | - set -x - modello plans/smoke.mdo java test-src 1.0.0 foo 8 - javac -d test-bin test-src/smoke/* - modello plans/smoke.mdo stax-reader test-src 1.0.0 foo 8 - javac -d test-bin -cp test-bin test-src/smoke/io/stax/* - find test-src test-bin - test -f test-bin/smoke/SomeBean.class - test -f test-bin/smoke/io/stax/SmokeStaxReader.class + how: tmt From 6160830c4a0522f5409fdd6622d9db338daf509c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:35:30 +0000 Subject: [PATCH 28/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 6cee2ee..c42f701 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?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, @@ -89,6 +89,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From ead878c54cf8dadfc14ee3671c192711b8b9b16c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Mar 2023 09:29:53 +0100 Subject: [PATCH 29/62] Port to Google Guice 5 --- modello.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modello.spec b/modello.spec index c42f701..b36b778 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?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, @@ -22,6 +22,7 @@ ExclusiveArch: %{java_arches} noarch BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local +BuildRequires: mvn(com.google.inject:guice) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) @@ -34,7 +35,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) -BuildRequires: mvn(org.sonatype.sisu:sisu-guice::no_aop:) %endif # Explicit javapackages-tools requires since modello script uses @@ -63,6 +63,9 @@ cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin +%pom_remove_dep -r :sisu-guice +%pom_add_dep com.google.inject:guice modello-core + %pom_remove_dep :jackson-bom %pom_disable_module modello-plugin-jackson modello-plugins %pom_disable_module modello-plugin-jsonschema modello-plugins @@ -79,7 +82,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-no_aop:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true +%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-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true %files -f .mfiles %doc LICENSE @@ -89,6 +92,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 8ad9533ca43dfaeed7b6c1e9b00dff2f943085ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 Mar 2023 18:00:20 +0200 Subject: [PATCH 30/62] Bootstrap build --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index b36b778..9c25b39 100644 --- a/modello.spec +++ b/modello.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: modello Version: 2.0.0 From 4ef4e03ce3830ab3f15f369ab94684e31c3ae866 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 Mar 2023 18:03:02 +0200 Subject: [PATCH 31/62] Non-bootstrap build This reverts commit 8ad9533ca43dfaeed7b6c1e9b00dff2f943085ac. --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 9c25b39..b36b778 100644 --- a/modello.spec +++ b/modello.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: modello Version: 2.0.0 From 2151f4a52c92c99674c81aa4be548ffe13ededa9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 Mar 2023 20:12:16 +0200 Subject: [PATCH 32/62] Rebuild with no changes --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index b36b778..9561b95 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.0.0 -Release: 4%{?dist} +Release: 5%{?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, @@ -92,6 +92,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 2a0dd5c2b9d4d71494f12e1fb60d136c1f6f2bf0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:39:19 +0000 Subject: [PATCH 33/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index 9561b95..dce2266 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.0.0 -Release: 5%{?dist} +Release: 6%{?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, @@ -92,6 +92,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 1cd453685bf7559f073921b97ed94afcf4ff2508 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 21 Aug 2023 10:52:21 +0200 Subject: [PATCH 34/62] Update to upstream version 2.1.1 --- .gitignore | 1 + 0001-Remove-dependency-on-Jsoup.patch | 52 --------------------------- modello.spec | 19 +++++++--- sources | 2 +- 4 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 0001-Remove-dependency-on-Jsoup.patch diff --git a/.gitignore b/.gitignore index 72469a3..38214fe 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /modello-1.10.0-source-release.zip /modello-1.11-source-release.zip /modello-2.0.0-source-release.zip +/modello-2.1.1-source-release.zip diff --git a/0001-Remove-dependency-on-Jsoup.patch b/0001-Remove-dependency-on-Jsoup.patch deleted file mode 100644 index 4b0b20d..0000000 --- a/0001-Remove-dependency-on-Jsoup.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 12cc1a306dc83b9bd6b49486e0c2e7403c569f40 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 22 Apr 2022 18:25:53 +0200 -Subject: [PATCH] Remove dependency on Jsoup - ---- - modello-plugins/modello-plugin-xdoc/pom.xml | 5 ----- - .../org/codehaus/modello/plugin/xdoc/XdocGenerator.java | 6 +----- - 2 files changed, 1 insertion(+), 10 deletions(-) - -diff --git a/modello-plugins/modello-plugin-xdoc/pom.xml b/modello-plugins/modello-plugin-xdoc/pom.xml -index 8e6705ad..2d3ad6b5 100644 ---- a/modello-plugins/modello-plugin-xdoc/pom.xml -+++ b/modello-plugins/modello-plugin-xdoc/pom.xml -@@ -27,11 +27,6 @@ - org.codehaus.plexus - plexus-utils - -- -- org.jsoup -- jsoup -- 1.14.3 -- - - org.xmlunit - xmlunit-core -diff --git a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java -index ad3bc2d1..5ff5b952 100644 ---- a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java -+++ b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java -@@ -56,8 +56,6 @@ import org.codehaus.plexus.util.StringUtils; - import org.codehaus.plexus.util.WriterFactory; - import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter; - import org.codehaus.plexus.util.xml.XMLWriter; --import org.jsoup.Jsoup; --import org.jsoup.nodes.Document; - - /** - * @author Jason van Zyl -@@ -787,8 +785,6 @@ public class XdocGenerator - */ - private static String rewrite( String text ) - { -- Document document = Jsoup.parseBodyFragment( text ); -- document.outputSettings().syntax( Document.OutputSettings.Syntax.xml ); -- return document.body().html(); -+ return text; - } - } --- -2.35.1 - diff --git a/modello.spec b/modello.spec index dce2266..024871f 100644 --- a/modello.spec +++ b/modello.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: modello -Version: 2.0.0 -Release: 6%{?dist} +Version: 2.1.1 +Release: 1%{?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, @@ -13,8 +13,6 @@ URL: https://codehaus-plexus.github.io/modello 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-Remove-dependency-on-Jsoup.patch - BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -26,14 +24,18 @@ BuildRequires: mvn(com.google.inject:guice) BuildRequires: mvn(junit:junit) 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) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) %endif @@ -58,7 +60,6 @@ API documentation for %{name}. %prep %setup -q -%patch0 -p1 cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin @@ -75,6 +76,11 @@ cp -p %{SOURCE1} LICENSE %pom_disable_module modello-plugin-snakeyaml modello-plugins %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin +# Requires velocity >= 2 +%pom_disable_module modello-plugin-velocity modello-plugins +%pom_remove_dep :modello-plugin-velocity modello-maven-plugin +rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java + %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) %mvn_build -f @@ -92,6 +98,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 diff --git a/sources b/sources index 962387a..1eea067 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-2.0.0-source-release.zip) = 69934156fe0e1eab6ef26f02e87b0aab0de2c74642f2cd93ca8556004f918643f578449c9d322b0388d9ff6730f83265a72592cab7544095d11042aacab285a3 +SHA512 (modello-2.1.1-source-release.zip) = 928ecf83d7555bba534fc0ad0a71ac245d1508ee09de5db5ae84eb5e982b9a7fad8d5e7370641a1d93316f558ee151535f0c48e53a56ed31df54d6d628a7bb77 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From e6fb422b01eac2112d3afcbc6b0f22c985253bad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 27 Aug 2023 07:46:14 +0200 Subject: [PATCH 35/62] Update to upstream version 2.1.2 --- .gitignore | 1 + ...-codehaus-plexus-build-api-1.2.0-345.patch | 184 ++++++++++++++++++ modello.spec | 26 +-- sources | 2 +- 4 files changed, 200 insertions(+), 13 deletions(-) create mode 100644 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch diff --git a/.gitignore b/.gitignore index 38214fe..23ab49c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /modello-1.11-source-release.zip /modello-2.0.0-source-release.zip /modello-2.1.1-source-release.zip +/modello-2.1.2-source-release.zip diff --git a/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch b/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch new file mode 100644 index 0000000..5b845c9 --- /dev/null +++ b/0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch @@ -0,0 +1,184 @@ +From f892c4e5906fcacaec99a146a2a36dd4ca5d5166 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Sun, 27 Aug 2023 07:49:01 +0200 +Subject: [PATCH] Revert "Switch to codehaus plexus-build-api 1.2.0 (#345)" + +This reverts commit c689155598257f225963b9332f57fe72dfd78753. +--- + modello-core/pom.xml | 2 +- + .../codehaus/modello/plugin/AbstractModelloGenerator.java | 2 +- + modello-maven-plugin/pom.xml | 2 +- + .../modello/maven/AbstractModelloGeneratorMojo.java | 2 +- + .../codehaus/modello/maven/ModelloConvertersMojoTest.java | 8 +------- + .../org/codehaus/modello/maven/ModelloJavaMojoTest.java | 8 +------- + modello-plugins/modello-plugin-java/pom.xml | 2 +- + .../codehaus/modello/AbstractModelloGeneratorTest.java | 6 ------ + pom.xml | 4 ++-- + 9 files changed, 9 insertions(+), 27 deletions(-) + +diff --git a/modello-core/pom.xml b/modello-core/pom.xml +index 636c03fe..7f9adf39 100644 +--- a/modello-core/pom.xml ++++ b/modello-core/pom.xml +@@ -13,7 +13,7 @@ + + + +- org.codehaus.plexus ++ org.sonatype.plexus + plexus-build-api + + +diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java +index bb59b439..334e16e8 100644 +--- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java ++++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java +@@ -43,7 +43,6 @@ import org.codehaus.modello.model.ModelField; + import org.codehaus.modello.model.Version; + import org.codehaus.plexus.PlexusConstants; + import org.codehaus.plexus.PlexusContainer; +-import org.codehaus.plexus.build.BuildContext; + import org.codehaus.plexus.component.repository.exception.ComponentLookupException; + import org.codehaus.plexus.context.Context; + import org.codehaus.plexus.context.ContextException; +@@ -51,6 +50,7 @@ import org.codehaus.plexus.logging.AbstractLogEnabled; + import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; + import org.codehaus.plexus.util.StringUtils; + import org.codehaus.plexus.util.io.CachingWriter; ++import org.sonatype.plexus.build.incremental.BuildContext; + + /** + * @author Jason van Zyl +diff --git a/modello-maven-plugin/pom.xml b/modello-maven-plugin/pom.xml +index 3687fb05..57227449 100644 +--- a/modello-maven-plugin/pom.xml ++++ b/modello-maven-plugin/pom.xml +@@ -121,7 +121,7 @@ + modello-plugin-velocity + + +- org.codehaus.plexus ++ org.sonatype.plexus + plexus-build-api + + +diff --git a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java +index 762b5784..51b75a12 100644 +--- a/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java ++++ b/modello-maven-plugin/src/main/java/org/codehaus/modello/maven/AbstractModelloGeneratorMojo.java +@@ -41,8 +41,8 @@ import org.codehaus.modello.ModelloParameterConstants; + import org.codehaus.modello.core.ModelloCore; + import org.codehaus.modello.model.Model; + import org.codehaus.modello.model.ModelValidationException; +-import org.codehaus.plexus.build.BuildContext; + import org.codehaus.plexus.util.StringUtils; ++import org.sonatype.plexus.build.incremental.BuildContext; + + /** + * @author Trygve Laugstøl +diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java +index 779f178d..23f466d3 100644 +--- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java ++++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java +@@ -26,10 +26,9 @@ import java.io.File; + import java.util.Arrays; + + import org.codehaus.modello.core.ModelloCore; +-import org.codehaus.plexus.ContainerConfiguration; + import org.codehaus.plexus.PlexusTestCase; +-import org.codehaus.plexus.build.BuildContext; + import org.codehaus.plexus.util.FileUtils; ++import org.sonatype.plexus.build.incremental.BuildContext; + + /** + * @author Brett Porter +@@ -99,9 +98,4 @@ public class ModelloConvertersMojoTest extends PlexusTestCase { + + assertFalse("The generated java file doesn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + } +- +- @Override +- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { +- containerConfiguration.setClassPathScanning("cache"); +- } + } +diff --git a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java +index f15b4031..bb5bb7cf 100644 +--- a/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java ++++ b/modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java +@@ -26,10 +26,9 @@ import java.io.File; + import java.util.Arrays; + + import org.codehaus.modello.core.ModelloCore; +-import org.codehaus.plexus.ContainerConfiguration; + import org.codehaus.plexus.PlexusTestCase; +-import org.codehaus.plexus.build.BuildContext; + import org.codehaus.plexus.util.FileUtils; ++import org.sonatype.plexus.build.incremental.BuildContext; + + /** + * @author Trygve Laugstøl +@@ -97,9 +96,4 @@ public class ModelloJavaMojoTest extends PlexusTestCase { + assertFalse( + "The generated java file shouldn't exist: '" + javaFile.getAbsolutePath() + "'.", javaFile.exists()); + } +- +- @Override +- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { +- containerConfiguration.setClassPathScanning("cache"); +- } + } +diff --git a/modello-plugins/modello-plugin-java/pom.xml b/modello-plugins/modello-plugin-java/pom.xml +index ea94c3c6..6ba7c01f 100644 +--- a/modello-plugins/modello-plugin-java/pom.xml ++++ b/modello-plugins/modello-plugin-java/pom.xml +@@ -17,7 +17,7 @@ + plexus-utils + + +- org.codehaus.plexus ++ org.sonatype.plexus + plexus-build-api + + +diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java +index f46cece1..e71231fb 100644 +--- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java ++++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java +@@ -32,7 +32,6 @@ import java.io.Reader; + import java.util.Optional; + import java.util.Properties; + +-import org.codehaus.plexus.ContainerConfiguration; + import org.codehaus.plexus.PlexusTestCase; + import org.codehaus.plexus.util.FileUtils; + import org.codehaus.plexus.util.ReaderFactory; +@@ -108,9 +107,4 @@ public abstract class AbstractModelloGeneratorTest extends PlexusTestCase { + new File(getOutputDirectory(), generatedXsdName)); + return saxParser; + } +- +- @Override +- protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { +- containerConfiguration.setClassPathScanning("cache"); +- } + } +diff --git a/pom.xml b/pom.xml +index 88f8ed6f..9a4ac6df 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -347,9 +347,9 @@ + 4.0.0 + + +- org.codehaus.plexus ++ org.sonatype.plexus + plexus-build-api +- 1.2.0 ++ 0.0.7 + + + junit +-- +2.41.0 + diff --git a/modello.spec b/modello.spec index 024871f..95471c8 100644 --- a/modello.spec +++ b/modello.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: modello -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are ASL 2.0. @@ -9,19 +9,19 @@ Summary: Modello Data Model toolkit # and are licensed under a 5-clause BSD license. License: MIT and ASL 2.0 and BSD URL: https://codehaus-plexus.github.io/modello +BuildArch: noarch +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 -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch +Patch0: 0001-Revert-Switch-to-codehaus-plexus-build-api-1.2.0-345.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local BuildRequires: mvn(com.google.inject:guice) -BuildRequires: mvn(junit:junit) 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) @@ -29,11 +29,11 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) -BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) +BuildRequires: mvn(org.apache.velocity:velocity-engine-core) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) @@ -60,11 +60,13 @@ API documentation for %{name}. %prep %setup -q +%patch0 -p1 cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin -%pom_remove_dep -r :sisu-guice +%pom_remove_dep :plexus-xml modello-core +%pom_remove_dep :sisu-guice modello-core %pom_add_dep com.google.inject:guice modello-core %pom_remove_dep :jackson-bom @@ -76,10 +78,7 @@ cp -p %{SOURCE1} LICENSE %pom_disable_module modello-plugin-snakeyaml modello-plugins %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin -# Requires velocity >= 2 -%pom_disable_module modello-plugin-velocity modello-plugins -%pom_remove_dep :modello-plugin-velocity modello-maven-plugin -rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocityMojo.java +%pom_disable_module modello-test %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) @@ -88,7 +87,7 @@ rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocity %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-api:guava:plexus-compiler/plexus-compiler-api:plexus-compiler/plexus-compiler-javac %{name} true +%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 %files -f .mfiles %doc LICENSE @@ -98,6 +97,9 @@ rm modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVelocity %doc LICENSE %changelog +* 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 diff --git a/sources b/sources index 1eea067..975aeff 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (modello-2.1.1-source-release.zip) = 928ecf83d7555bba534fc0ad0a71ac245d1508ee09de5db5ae84eb5e982b9a7fad8d5e7370641a1d93316f558ee151535f0c48e53a56ed31df54d6d628a7bb77 +SHA512 (modello-2.1.2-source-release.zip) = 2824bcd3fbf8244fbec527e06f1be9aa17a176e4fd4159c228b576f62f94592c19fd39581fa4cd211c4ddc07b86d3595c992cf0a7405e341513bdd74261f4ecd SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 13220ce6f2549e0ade0d2ba6daf24c4f42b86776 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:16:14 +0200 Subject: [PATCH 36/62] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- modello.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modello.spec b/modello.spec index 95471c8..d2b136f 100644 --- a/modello.spec +++ b/modello.spec @@ -2,12 +2,12 @@ Name: modello Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?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, -# and are licensed under a 5-clause BSD license. -License: MIT and ASL 2.0 and BSD +# and are licensed under a 5-clause BSD license (Plexus in SPDX). +License: MIT AND Apache-2.0 AND Plexus URL: https://codehaus-plexus.github.io/modello BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -97,6 +97,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From fb6200acea379d90bde420210ee297a1c200b77e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 37/62] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 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: f37 + ref: f40 execute: how: tmt From 37a1892cba4edff60d02f1e550894b86fa4d0ea6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:31:18 +0000 Subject: [PATCH 38/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index d2b136f..bf7e484 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 2%{?dist} +Release: 3%{?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, @@ -97,6 +97,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 14c96d51740dc7aceefa59a4315aec974286b18d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 07:51:34 +0000 Subject: [PATCH 39/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index bf7e484..d904131 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 3%{?dist} +Release: 4%{?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, @@ -97,6 +97,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From a0d7f5b0e5c40238baef373663f33e36d34ab25f Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:31:51 +0100 Subject: [PATCH 40/62] 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 --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index d904131..e985cbd 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 4%{?dist} +Release: 5%{?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, @@ -97,6 +97,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 9a9bbfe7cc1330aaf38eabb4ff938c3520d83928 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:24:31 +0100 Subject: [PATCH 41/62] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index e985cbd..ba167b6 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 5%{?dist} +Release: 6%{?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, @@ -97,6 +97,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 6d5a45ea9d48c8bbec37e6ccc48ca7741a841f6b Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 42/62] Eliminate use of obsolete %patchN syntax (#2283636) --- modello.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index ba167b6..9737f6e 100644 --- a/modello.spec +++ b/modello.spec @@ -60,7 +60,7 @@ API documentation for %{name}. %prep %setup -q -%patch0 -p1 +%patch -P0 -p1 cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin From 948209c586c4b2b5abc05c7e7d282e90b0b10644 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 31 May 2024 05:41:47 +0200 Subject: [PATCH 43/62] Switch to a newer %patch syntax --- modello.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modello.spec b/modello.spec index 9737f6e..c87411b 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 6%{?dist} +Release: 7%{?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, @@ -60,7 +60,7 @@ API documentation for %{name}. %prep %setup -q -%patch -P0 -p1 +%patch 0 -p1 cp -p %{SOURCE1} LICENSE # We don't generate site; don't pull extra dependencies. %pom_remove_plugin :maven-site-plugin @@ -97,6 +97,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From 0ec59091a1c829c8b2b4b48ca4d8e8b631af3fd7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Jun 2024 14:49:49 +0200 Subject: [PATCH 44/62] Extract smoke tests out of test plan We want tests to be stored directly in the file system instead of being embedded into tests plans. --- plans/smoke.fmf | 17 +-------------- tests/Sanity/smoke/main.fmf | 6 +++++ tests/Sanity/smoke/runtest.sh | 29 +++++++++++++++++++++++++ {plans => tests/Sanity/smoke}/smoke.mdo | 0 tests/main.fmf | 4 ++++ 5 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 tests/Sanity/smoke/main.fmf create mode 100755 tests/Sanity/smoke/runtest.sh rename {plans => tests/Sanity/smoke}/smoke.mdo (100%) create mode 100644 tests/main.fmf diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 72ff510..a1e7bfd 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,20 +1,5 @@ summary: Basic smoke test discover: - how: shell - tests: - - name: /smoke/generate-stax-reader - test: | - set -x - PATH=/usr/lib/jvm/java-11-openjdk/bin:${PATH} - modello plans/smoke.mdo java test-src 1.0.0 foo 8 - javac -d test-bin test-src/smoke/* - modello plans/smoke.mdo stax-reader test-src 1.0.0 foo 8 - javac -d test-bin -cp test-bin test-src/smoke/io/stax/* - find test-src test-bin - test -f test-bin/smoke/SomeBean.class - test -f test-bin/smoke/io/stax/SmokeStaxReader.class -prepare: - how: install - package: java-11-openjdk-devel + how: fmf execute: how: tmt diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..bd1bd91 --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,6 @@ +summary: modello smoke test +description: | + Test basic functionality of modello. +require: + - modello + - java-21-openjdk-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..c5cca84 --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /usr/share/beakerlib/beakerlib.sh + +rlJournalStart + + PATH=/usr/lib/jvm/java-21-openjdk/bin:${PATH} + + rlPhaseStartTest "check for presence of modello command" + rlAssertRpm modello + rlAssertBinaryOrigin modello modello + rlPhaseEnd + + rlPhaseStartTest "display modello usage" + rlRun -s "modello" 1 + rlAssertGrep "Usage: modello" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "generate STAX reader" + rlRun "modello smoke.mdo java test-src 1.0.0 foo 8" + rlRun "javac -d test-bin test-src/smoke/*" + rlAssertExists test-bin/smoke/SomeBean.class + rlRun "modello smoke.mdo stax-reader test-src 1.0.0 foo 8" + rlRun "javac -d test-bin -cp test-bin test-src/smoke/io/stax/*" + rlAssertExists test-bin/smoke/io/stax/SmokeStaxReader.class + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/plans/smoke.mdo b/tests/Sanity/smoke/smoke.mdo similarity index 100% rename from plans/smoke.mdo rename to tests/Sanity/smoke/smoke.mdo diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..99fd67e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 0 From 187d128bc1893b2c2f1546236606691001e714d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:30:50 +0000 Subject: [PATCH 45/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- modello.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modello.spec b/modello.spec index c87411b..41c2d82 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 7%{?dist} +Release: 8%{?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, @@ -97,6 +97,9 @@ cp -p %{SOURCE1} LICENSE %doc LICENSE %changelog +* 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 From afd95975d77c7e8b47af896f9cb0764c7458518b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 24 Jul 2024 10:51:52 +0200 Subject: [PATCH 46/62] Install license files in licensedir instead of docdir --- modello.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modello.spec b/modello.spec index 41c2d82..2a6f02a 100644 --- a/modello.spec +++ b/modello.spec @@ -2,7 +2,7 @@ Name: modello Version: 2.1.2 -Release: 8%{?dist} +Release: 9%{?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, @@ -90,13 +90,16 @@ cp -p %{SOURCE1} LICENSE %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 %files -f .mfiles -%doc LICENSE +%license LICENSE %{_bindir}/modello %files javadoc -f .mfiles-javadoc -%doc LICENSE +%license LICENSE %changelog +* 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 From 4715d8d8433b2bc3f8674e513e92870cd2115c68 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 47/62] 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 6f79d83f26a27a693186d21fc63b60358ada1f59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 48/62] 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 49/62] 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 50/62] 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 51/62] 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 52/62] 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 53/62] 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 54/62] 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 55/62] 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 56/62] 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 57/62] 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 58/62] 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 59/62] 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 60/62] 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 61/62] 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 62/62] 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