From 6b25de75572ac549700f3a6f6256265d559a3e44 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 14 Jul 2023 19:41:28 +0300 Subject: [PATCH] Initial import from Fedora --- .gitignore | 19 ++ .modello.metadata | 2 + SOURCES/.fmf/version | 1 + SOURCES/0001-Remove-dependency-on-Jsoup.patch | 52 +++ SOURCES/ci.fmf | 1 + SOURCES/gating.yaml | 8 + SOURCES/plans/smoke.fmf | 14 + SOURCES/plans/smoke.mdo | 26 ++ SPECS/modello.spec | 323 ++++++++++++++++++ 9 files changed, 446 insertions(+) create mode 100644 .gitignore create mode 100644 .modello.metadata create mode 100644 SOURCES/.fmf/version create mode 100644 SOURCES/0001-Remove-dependency-on-Jsoup.patch create mode 100644 SOURCES/ci.fmf create mode 100644 SOURCES/gating.yaml create mode 100644 SOURCES/plans/smoke.fmf create mode 100644 SOURCES/plans/smoke.mdo create mode 100644 SPECS/modello.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..72469a3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +/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 +/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 +/modello-2.0.0-source-release.zip diff --git a/.modello.metadata b/.modello.metadata new file mode 100644 index 0000000..38a46e1 --- /dev/null +++ b/.modello.metadata @@ -0,0 +1,2 @@ +2b8b815229aa8a61e483fb4ba0588b8b6c491890 SOURCES/LICENSE-2.0.txt +74d6df7745011aff6d2c8fcd6402b970793d2f84 SOURCES/modello-2.0.0-source-release.zip diff --git a/SOURCES/.fmf/version b/SOURCES/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/SOURCES/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/SOURCES/0001-Remove-dependency-on-Jsoup.patch b/SOURCES/0001-Remove-dependency-on-Jsoup.patch new file mode 100644 index 0000000..4b0b20d --- /dev/null +++ b/SOURCES/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/SOURCES/ci.fmf b/SOURCES/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/SOURCES/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/SOURCES/gating.yaml b/SOURCES/gating.yaml new file mode 100644 index 0000000..8653363 --- /dev/null +++ b/SOURCES/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} diff --git a/SOURCES/plans/smoke.fmf b/SOURCES/plans/smoke.fmf new file mode 100644 index 0000000..b016e0b --- /dev/null +++ b/SOURCES/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 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 diff --git a/SOURCES/plans/smoke.mdo b/SOURCES/plans/smoke.mdo new file mode 100644 index 0000000..48d1325 --- /dev/null +++ b/SOURCES/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 + + + + + diff --git a/SPECS/modello.spec b/SPECS/modello.spec new file mode 100644 index 0000000..950809c --- /dev/null +++ b/SPECS/modello.spec @@ -0,0 +1,323 @@ +%bcond_with bootstrap + +Name: modello +Version: 2.0.0 +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 +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 + +%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) +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-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 +# /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 +%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 :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 +%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 + +%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 + +%files -f .mfiles +%doc LICENSE +%{_bindir}/modello + +%files javadoc -f .mfiles-javadoc +%doc LICENSE + +%changelog +* Fri Jul 14 2023 MSVSphere Packaging Team - 2.0.0-2 +- Rebuilt for MSVSphere 9.2 + +* 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