From 07151c9e89ab6ffcf1d204c4b8e3f88e766655f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Apr 2016 10:07:38 +0200 Subject: [PATCH 01/82] 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 02/82] 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 03/82] 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 04/82] - 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 05/82] 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 06/82] 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 ++ + + + -+ +- ++ + -+ +- ++ -+ +- ++