From be212392d85c7bc0404d05706c8ba4f20b2f1645 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: May 14 2021 07:04:31 +0000 Subject: Merge modular branch --- diff --git a/modello.spec b/modello.spec index c34d388..a73ca7d 100644 --- a/modello.spec +++ b/modello.spec @@ -1,11 +1,9 @@ -%bcond_without jackson -%bcond_without snakeyaml +%bcond_with bootstrap Name: modello -Summary: Modello Data Model toolkit -Epoch: 0 Version: 1.11 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, # and are licensed under a 5-clause BSD license. @@ -18,6 +16,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) @@ -31,15 +32,6 @@ 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 @@ -55,48 +47,37 @@ 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 -%if %{without jackson} %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 -%endif -%if %{without snakeyaml} %pom_disable_module modello-plugin-snakeyaml modello-plugins %pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin -%endif - %build -# FIXME: tests fail +# 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 @@ -104,7 +85,6 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %files javadoc -f .mfiles-javadoc %doc LICENSE - %changelog * Tue Jan 26 2021 Fedora Release Engineering - 0:1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -121,12 +101,24 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml * 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