.gitignore

@@ -1 +1 @@
-SOURCES/modello-1.11-source-release.zip
+SOURCES/modello-1.9.1-source-release.zip

.modello.metadata

@@ -1 +1 @@
-a3ddeb4321878fcd8501e94738c556e9f0f6e98b SOURCES/modello-1.11-source-release.zip
+91a5c40c2d36fef03217aa0342f10cf3f225e451 SOURCES/modello-1.9.1-source-release.zip

SPECS/modello.spec

@@ -1,6 +1,10 @@
+%bcond_without jackson
+%bcond_without snakeyaml
+
 Name:           modello
-Version:        1.11
+Version:        1.9.1
-Release:        2%{?dist}
+Release:        7%{?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.
@@ -25,6 +29,14 @@ 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
@@ -38,6 +50,7 @@ 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}
 
@@ -52,13 +65,17 @@ cp -p %{SOURCE1} LICENSE
 # 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
 # skip tests because we have too old xmlunit in Fedora now (1.0.8)
@@ -71,24 +88,12 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
 
 %files -f .mfiles
 %doc LICENSE
-%{_bindir}/modello
+%{_bindir}/*
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Jun 26 2019 Marian Koncek <mkoncek@redhat.com> - 1.11-1
-- Update to upstream version 1.11
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.0-2
-- Mass rebuild for javapackages-tools 201901
-
-* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.0-1
-- Update to upstream version 1.10.0
-
 * Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.9.1-7
 - Add explicit requires on javapackages-tools for modello script.