diff --git a/testng.spec b/testng.spec index f0aa554..3c649ae 100644 --- a/testng.spec +++ b/testng.spec @@ -1,8 +1,9 @@ %bcond_without groovy +%bcond_without snakeyaml Name: testng Version: 6.14.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java-based testing framework License: ASL 2.0 URL: http://testng.org/ @@ -24,13 +25,15 @@ BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache-extras.beanshell:bsh) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: mvn(org.yaml:snakeyaml) %if %{with groovy} BuildRequires: mvn(org.assertj:assertj-core) >= 3.8.0 BuildRequires: mvn(org.codehaus.gmavenplus:gmavenplus-plugin) BuildRequires: mvn(org.codehaus.groovy:groovy-all) BuildRequires: mvn(org.spockframework:spock-core) %endif +%if %{with snakeyaml} +BuildRequires: mvn(org.yaml:snakeyaml) +%endif %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -60,6 +63,12 @@ find -name *.class -delete %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-javadoc-plugin +%if %{without snakeyaml} +%pom_remove_dep org.yaml:snakeyaml +rm src/main/java/org/testng/internal/Yaml*.java +rm src/main/java/org/testng/Converter.java +%endif + # missing test deps %if %{with groovy} %pom_add_plugin "org.codehaus.gmavenplus:gmavenplus-plugin" pom.xml \ @@ -81,10 +90,10 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %mvn_alias : :::jdk15: %build -%if %{with groovy} -%mvn_build -- -Dmaven.local.debug=true +%if %{with groovy} && %{with snakeyaml} +%mvn_build %else -%mvn_build -f -- -Dmaven.local.debug=true +%mvn_build -f %endif %install @@ -98,6 +107,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Tue Jul 17 2018 Mikolaj Izdebski - 6.14.3-4 +- Allow conditionally building without snakeyaml + * Sat Jul 14 2018 Fedora Release Engineering - 6.14.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild