From 93bf19d0718add75334ae01289c5c1c69b4dd5f8 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 7 Sep 2015 12:33:53 +0100 Subject: [PATCH 01/88] Update to 6.9.5 --- .gitignore | 2 +- sources | 2 +- testng.spec | 67 ++++++++++++++++++++++++----------------------------- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index f46d75b..1b57129 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -testng-5.11.zip /testng-6.0.1.tar.xz /testng-6.8.tar.gz /testng-6.8.5.tar.gz @@ -7,3 +6,4 @@ testng-5.11.zip /testng-6.8.14.tar.gz /testng-6.8.17.tar.gz /testng-6.8.21.tar.gz +/testng-6.9.5.tar.gz diff --git a/sources b/sources index 62d7cca..73a3afd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d2331958850922796329a9d9e141e02 testng-6.8.21.tar.gz +acfcadb5d16c5d7a317d1af0890ab1b4 testng-6.9.5.tar.gz diff --git a/testng.spec b/testng.spec index 8eae07e..a2d19af 100644 --- a/testng.spec +++ b/testng.spec @@ -2,27 +2,26 @@ %global group_id org.testng Name: testng -Version: 6.8.21 -Release: 2%{?dist} +Version: 6.9.5 +Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL URL: http://testng.org/ -Source0: https://github.com/cbeust/testng/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/cbeust/testng/archive/testng-%{version}.tar.gz BuildArch: noarch -BuildRequires: mvn(com.beust:jcommander) >= 1.27 -BuildRequires: mvn(com.google.guava:guava) -BuildRequires: mvn(com.google.inject:guice) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.beanshell:bsh) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: mvn(org.yaml:snakeyaml) - -BuildRequires: maven-local -BuildRequires: maven-plugin-bundle +BuildRequires: maven-local +BuildRequires: mvn(com.beust:jcommander) +BuildRequires: mvn(com.google.inject:guice::no_aop:) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.beanshell:bsh) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: mvn(org.yaml:snakeyaml) %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -39,51 +38,45 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -# build fix for new guice -%pom_add_dep com.google.guava:guava::provided -sed -i "s|com.google.inject.internal|com.google.common.collect|" \ - src/main/java/org/testng/xml/XmlDependencies.java \ - src/main/java/org/testng/xml/XmlGroups.java \ - src/main/java/org/testng/xml/dom/TestNGTagFactory.java \ - src/test/java/test/dependent/InstanceSkipSampleTest.java \ - src/test/java/test/mustache/MustacheTest.java \ - src/test/java/test/thread/B.java +# remove any bundled libs +find -name *.jar -delete +find -name *.class -delete +# these are unnecessary %pom_remove_plugin :maven-gpg-plugin %pom_remove_plugin :maven-source-plugin - -# remove bundled stuff -rm -rf spring -rm -rf 3rdparty -rm -rf lib-supplied -rm -rf gigaspaces -rm -f *.jar +%pom_remove_plugin :maven-javadoc-plugin -# convert to UTF-8 -native2ascii -encoding UTF-8 src/main/java/org/testng/internal/Version.java \ - src/main/java/org/testng/internal/Version.java +# test deps not in Fedora +%pom_remove_dep org.assertj:assertj-core -iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8 -mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt +# plugins not in Fedora +%pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin +sed -i -e 's/VersionTemplateJava/Version.java/' pom.xml +mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resources/org/testng/internal/Version.java %mvn_file : %{name} # jdk15 classifier is used by some other packages %mvn_alias : :::jdk15: %build -%mvn_build -- -Dmaven.local.debug=true +# TODO build tests when assetj-core becomes available +%mvn_build -f -- -Dmaven.local.debug=true %install %mvn_install %files -f .mfiles -%doc ANNOUNCEMENT.txt CHANGES.txt README +%doc CHANGES.txt README.md %license LICENSE.txt %files javadoc -f .mfiles-javadoc %license LICENSE.txt %changelog +* Mon Sep 07 2015 Mat Booth - 6.9.5-1 +- Update to 6.9.5 + * Fri Jun 19 2015 Fedora Release Engineering - 6.8.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 07eedebb764f0830a4adc9984113aa755403932a Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 13 Oct 2015 02:55:29 +0200 Subject: [PATCH 02/88] Update to 6.9.8 --- .gitignore | 1 + sources | 2 +- testng.spec | 22 +++++++++++++--------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1b57129..66d9b05 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /testng-6.8.17.tar.gz /testng-6.8.21.tar.gz /testng-6.9.5.tar.gz +/6.9.8.tar.gz diff --git a/sources b/sources index 73a3afd..984c12c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acfcadb5d16c5d7a317d1af0890ab1b4 testng-6.9.5.tar.gz +aa62b50454e578657bc0eede8afeb20a 6.9.8.tar.gz diff --git a/testng.spec b/testng.spec index a2d19af..e2e110d 100644 --- a/testng.spec +++ b/testng.spec @@ -1,16 +1,16 @@ %global group_id org.testng -Name: testng -Version: 6.9.5 -Release: 1%{?dist} -Summary: Java-based testing framework +Name: testng +Version: 6.9.8 +Release: 1%{?dist} +Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL -License: ASL 2.0 and CPL -URL: http://testng.org/ -Source0: https://github.com/cbeust/testng/archive/testng-%{version}.tar.gz +License: ASL 2.0 and CPL +URL: http://testng.org/ +Source0: https://github.com/cbeust/testng/archive/%{version}.tar.gz -BuildArch: noarch +BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(com.beust:jcommander) @@ -18,6 +18,7 @@ BuildRequires: mvn(com.google.inject:guice::no_aop:) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.beanshell:bsh) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) @@ -30,7 +31,7 @@ distributed test running. It is designed to cover unit tests as well as functional, end-to-end, integration, etc. %package javadoc -Summary: API documentation for %{name} +Summary: API documentation for %{name} %description javadoc This package contains the API documentation for %{name}. @@ -74,6 +75,9 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou %license LICENSE.txt %changelog +* Tue Oct 13 2015 gil cattaneo 6.9.8-1 +- Update to 6.9.8 + * Mon Sep 07 2015 Mat Booth - 6.9.5-1 - Update to 6.9.5 From 50618bce9802a80dbbf643da4e6dfd5a51eba1c9 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 13 Oct 2015 03:04:06 +0200 Subject: [PATCH 03/88] enable test suite --- testng.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testng.spec b/testng.spec index e2e110d..b47bb3f 100644 --- a/testng.spec +++ b/testng.spec @@ -37,7 +37,7 @@ Summary: API documentation for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{name}-%{version} +%setup -q -n %{name}-%{version} # remove any bundled libs find -name *.jar -delete @@ -49,7 +49,7 @@ find -name *.class -delete %pom_remove_plugin :maven-javadoc-plugin # test deps not in Fedora -%pom_remove_dep org.assertj:assertj-core +#%% pom_remove_dep org.assertj:assertj-core # plugins not in Fedora %pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin @@ -61,8 +61,8 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou %mvn_alias : :::jdk15: %build -# TODO build tests when assetj-core becomes available -%mvn_build -f -- -Dmaven.local.debug=true +# TODO build tests when assetj-core becomes available -f +%mvn_build -- -Dmaven.local.debug=true %install %mvn_install From 2c82f601b5f655b15bb15dd55ba8f265d7621c94 Mon Sep 17 00:00:00 2001 From: gil Date: Tue, 27 Oct 2015 08:00:39 +0100 Subject: [PATCH 04/88] update to 6.9.9 --- .gitignore | 1 + sources | 2 +- testng.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 66d9b05..a5e1ce1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /testng-6.8.21.tar.gz /testng-6.9.5.tar.gz /6.9.8.tar.gz +/6.9.9.tar.gz diff --git a/sources b/sources index 984c12c..6792bf9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa62b50454e578657bc0eede8afeb20a 6.9.8.tar.gz +57df5e7f3bd5606f2520c691cbd7fef3 6.9.9.tar.gz diff --git a/testng.spec b/testng.spec index b47bb3f..1d68f15 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.9.8 +Version: 6.9.9 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -48,20 +48,19 @@ find -name *.class -delete %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-javadoc-plugin -# test deps not in Fedora -#%% pom_remove_dep org.assertj:assertj-core - # plugins not in Fedora %pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin sed -i -e 's/VersionTemplateJava/Version.java/' pom.xml mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resources/org/testng/internal/Version.java +cp -p ./src/main/java/*.dtd.html ./src/main/resources/. + %mvn_file : %{name} # jdk15 classifier is used by some other packages %mvn_alias : :::jdk15: %build -# TODO build tests when assetj-core becomes available -f + %mvn_build -- -Dmaven.local.debug=true %install @@ -75,6 +74,9 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou %license LICENSE.txt %changelog +* Tue Oct 27 2015 gil cattaneo 6.9.9-1 +- Update to 6.9.9 + * Tue Oct 13 2015 gil cattaneo 6.9.8-1 - Update to 6.9.8 From e0085f7dfa152ced8e47f69f370127ce184c3394 Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 8 Jan 2016 15:48:59 +0100 Subject: [PATCH 05/88] Update to 6.9.10 --- .gitignore | 1 + sources | 2 +- testng.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a5e1ce1..0d717c0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /testng-6.9.5.tar.gz /6.9.8.tar.gz /6.9.9.tar.gz +/6.9.10.tar.gz diff --git a/sources b/sources index 6792bf9..f968771 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57df5e7f3bd5606f2520c691cbd7fef3 6.9.9.tar.gz +170a556ea372caf535a56366c4b1c595 6.9.10.tar.gz diff --git a/testng.spec b/testng.spec index 1d68f15..d4fca8e 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ %global group_id org.testng Name: testng -Version: 6.9.9 +Version: 6.9.10 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -39,8 +39,8 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{version} -# remove any bundled libs -find -name *.jar -delete +# remove any bundled libs, but not test resources +find ! -path "*/test/*" -name *.jar -print -delete find -name *.class -delete # these are unnecessary @@ -55,6 +55,7 @@ mv ./src/main/resources/org/testng/internal/VersionTemplateJava ./src/main/resou cp -p ./src/main/java/*.dtd.html ./src/main/resources/. + %mvn_file : %{name} # jdk15 classifier is used by some other packages %mvn_alias : :::jdk15: @@ -74,6 +75,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Fri Jan 08 2016 gil cattaneo 6.9.10-1 +- Update to 6.9.10 + * Tue Oct 27 2015 gil cattaneo 6.9.9-1 - Update to 6.9.9 From 35ca6cdab6c3b158bed4afd5b6f0cf243ac58fbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 01:29:06 +0000 Subject: [PATCH 06/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index d4fca8e..68d35e5 100644 --- a/testng.spec +++ b/testng.spec @@ -3,7 +3,7 @@ Name: testng Version: 6.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -75,6 +75,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 6.9.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jan 08 2016 gil cattaneo 6.9.10-1 - Update to 6.9.10 From 07151c9e89ab6ffcf1d204c4b8e3f88e766655f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Apr 2016 10:07:38 +0200 Subject: [PATCH 07/88] Update to upstream version 6.9.11 --- .gitignore | 1 + sources | 2 +- testng.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0d717c0..838c80e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /6.9.8.tar.gz /6.9.9.tar.gz /6.9.10.tar.gz +/6.9.11.tar.gz diff --git a/sources b/sources index f968771..db4f285 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -170a556ea372caf535a56366c4b1c595 6.9.10.tar.gz +2364b55f3cd4973604355c65c72165ee 6.9.11.tar.gz diff --git a/testng.spec b/testng.spec index 68d35e5..7db72d5 100644 --- a/testng.spec +++ b/testng.spec @@ -2,8 +2,8 @@ %global group_id org.testng Name: testng -Version: 6.9.10 -Release: 2%{?dist} +Version: 6.9.11 +Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -75,6 +75,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Wed Apr 20 2016 Mikolaj Izdebski - 6.9.11-1 +- Update to upstream version 6.9.11 + * Fri Feb 05 2016 Fedora Release Engineering - 6.9.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a9f892bd1b3b5f0aeb07372ced242f8ed40814b5 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 2 Nov 2016 11:45:46 +0000 Subject: [PATCH 08/88] Update to upstream version 6.9.12 - Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package --- .gitignore | 4 ++++ sources | 2 +- testng.spec | 22 +++++++++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 838c80e..9c623c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/noarch/ +/.build-*.log +/*.src.rpm /testng-6.0.1.tar.xz /testng-6.8.tar.gz /testng-6.8.5.tar.gz @@ -11,3 +14,4 @@ /6.9.9.tar.gz /6.9.10.tar.gz /6.9.11.tar.gz +/6.9.12.tar.gz diff --git a/sources b/sources index db4f285..a6c1768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2364b55f3cd4973604355c65c72165ee 6.9.11.tar.gz +00f1b9b2bf82ee854e9ec0ddbccfab2e 6.9.12.tar.gz diff --git a/testng.spec b/testng.spec index 7db72d5..d97b03e 100644 --- a/testng.spec +++ b/testng.spec @@ -1,8 +1,5 @@ - -%global group_id org.testng - Name: testng -Version: 6.9.11 +Version: 6.9.12 Release: 1%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL @@ -20,8 +17,11 @@ BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.beanshell:bsh) +BuildRequires: mvn(org.codehaus.gmavenplus:gmavenplus-plugin) +BuildRequires: mvn(org.codehaus.groovy:groovy-all) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: mvn(org.spockframework:spock-core) BuildRequires: mvn(org.yaml:snakeyaml) %description @@ -48,6 +48,15 @@ find -name *.class -delete %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-javadoc-plugin +# missing test deps +%pom_add_plugin "org.codehaus.gmavenplus:gmavenplus-plugin" pom.xml \ + "addTestSourcestestGenerateStubstestCompileremoveTestStubs" +%pom_add_dep "org.spockframework:spock-core::test" +%pom_add_dep "org.codehaus.groovy:groovy-all::test" + +# avoid SNAPSHOT in version number +sed -i -e '//s/-SNAPSHOT//' pom.xml + # plugins not in Fedora %pom_remove_plugin com.coderplus.maven.plugins:copy-rename-maven-plugin sed -i -e 's/VersionTemplateJava/Version.java/' pom.xml @@ -61,7 +70,6 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %mvn_alias : :::jdk15: %build - %mvn_build -- -Dmaven.local.debug=true %install @@ -75,6 +83,10 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Tue Nov 01 2016 Mat Booth - 6.9.12-1 +- Update to upstream version 6.9.12 +- Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package + * Wed Apr 20 2016 Mikolaj Izdebski - 6.9.11-1 - Update to upstream version 6.9.11 From 95bdc138073dc33eda956a40c7b079c7bf55812a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 1 Feb 2017 18:59:28 +0100 Subject: [PATCH 09/88] Introduce build-conditional to allow building without groovy --- testng.spec | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/testng.spec b/testng.spec index d97b03e..f418e79 100644 --- a/testng.spec +++ b/testng.spec @@ -1,6 +1,8 @@ +%bcond_without groovy + Name: testng Version: 6.9.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -15,14 +17,16 @@ BuildRequires: mvn(com.google.inject:guice::no_aop:) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.assertj:assertj-core) BuildRequires: mvn(org.beanshell:bsh) -BuildRequires: mvn(org.codehaus.gmavenplus:gmavenplus-plugin) -BuildRequires: mvn(org.codehaus.groovy:groovy-all) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: mvn(org.spockframework:spock-core) BuildRequires: mvn(org.yaml:snakeyaml) +%if %{with groovy} +BuildRequires: mvn(org.assertj:assertj-core) +BuildRequires: mvn(org.codehaus.gmavenplus:gmavenplus-plugin) +BuildRequires: mvn(org.codehaus.groovy:groovy-all) +BuildRequires: mvn(org.spockframework:spock-core) +%endif %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -49,10 +53,12 @@ find -name *.class -delete %pom_remove_plugin :maven-javadoc-plugin # missing test deps +%if %{with groovy} %pom_add_plugin "org.codehaus.gmavenplus:gmavenplus-plugin" pom.xml \ "addTestSourcestestGenerateStubstestCompileremoveTestStubs" %pom_add_dep "org.spockframework:spock-core::test" %pom_add_dep "org.codehaus.groovy:groovy-all::test" +%endif # avoid SNAPSHOT in version number sed -i -e '//s/-SNAPSHOT//' pom.xml @@ -70,7 +76,11 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %mvn_alias : :::jdk15: %build +%if %{with groovy} %mvn_build -- -Dmaven.local.debug=true +%else +%mvn_build -f -- -Dmaven.local.debug=true +%endif %install %mvn_install @@ -83,6 +93,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Wed Feb 1 2017 Mikolaj Izdebski - 6.9.12-2 +- Introduce build-conditional to allow building without groovy + * Tue Nov 01 2016 Mat Booth - 6.9.12-1 - Update to upstream version 6.9.12 - Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package From 5e7e764257eeaced38fdb25edec5e7a037da5319 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 15:48:03 +0000 Subject: [PATCH 10/88] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index f418e79..6feb235 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ Name: testng Version: 6.9.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework # org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL License: ASL 2.0 and CPL @@ -93,6 +93,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 6.9.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 1 2017 Mikolaj Izdebski - 6.9.12-2 - Introduce build-conditional to allow building without groovy From 1bc5a1eb30d6f640e32f757e6e5d09bb399f9608 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 17 Feb 2017 14:38:09 +0000 Subject: [PATCH 11/88] License correction --- testng.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testng.spec b/testng.spec index 6feb235..1b99ec7 100644 --- a/testng.spec +++ b/testng.spec @@ -2,10 +2,9 @@ Name: testng Version: 6.9.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java-based testing framework -# org/testng/remote/strprotocol/AbstractRemoteTestRunnerClient.java is CPL -License: ASL 2.0 and CPL +License: ASL 2.0 URL: http://testng.org/ Source0: https://github.com/cbeust/testng/archive/%{version}.tar.gz @@ -93,6 +92,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Fri Feb 17 2017 Mat Booth - 6.9.12-4 +- License correction + * Sat Feb 11 2017 Fedora Release Engineering - 6.9.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2f8a7def0a7b836b8aea3ee5c6ecacf1ec3cf608 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 31 May 2017 13:46:43 +0200 Subject: [PATCH 12/88] Avoid accidental javascript in comment --- ...oid-accidental-javascript-in-javadoc.patch | 25 +++++++++++++++++++ testng.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Avoid-accidental-javascript-in-javadoc.patch diff --git a/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch new file mode 100644 index 0000000..8016b86 --- /dev/null +++ b/0001-Avoid-accidental-javascript-in-javadoc.patch @@ -0,0 +1,25 @@ +From 214bd64764a48c5c3ad68829e0e35377f45ce221 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Wed, 31 May 2017 13:44:36 +0200 +Subject: [PATCH] Avoid accidental javascript in javadoc + +--- + src/main/java/org/testng/xml/TestNGContentHandler.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java +index e36c413..da9a069 100755 +--- a/src/main/java/org/testng/xml/TestNGContentHandler.java ++++ b/src/main/java/org/testng/xml/TestNGContentHandler.java +@@ -240,7 +240,7 @@ public class TestNGContentHandler extends DefaultHandler { + } + + /** +- * Parse ++ + + + -+ +- ++ + -+ +- ++ -+ +- ++