diff --git a/modello.spec b/modello.spec index 98f39b0..f15d09e 100644 --- a/modello.spec +++ b/modello.spec @@ -1,6 +1,8 @@ +%bcond_without jackson + Name: modello Version: 1.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are @@ -13,9 +15,6 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) @@ -30,6 +29,11 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) BuildRequires: mvn(org.yaml:snakeyaml) +%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 %description Modello is a Data Model toolkit in use by the Apache Maven Project. @@ -55,6 +59,13 @@ 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 + %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) %mvn_build -f -- -Dmaven.version=3.1.1 @@ -73,6 +84,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* 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