From efd7977140a299deacde7cd63fb69dd1d7b729b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 18:46:42 +0000 Subject: [PATCH 01/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index 840c43e..c2db5a3 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ Name: testng Version: 6.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework License: ASL 2.0 URL: http://testng.org/ @@ -98,6 +98,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 6.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 23 2017 Mat Booth - 6.12-2 - Allow OSGi metadata to export all packages including internal ones From 4cf4fc70fe3e2f53ab4cc33eda265e8a9b6ee77b Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 20 Mar 2018 11:15:26 +0200 Subject: [PATCH 02/71] Update to upstream 6.14.3. --- .gitignore | 1 + sources | 2 +- testng.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5eb362b..d27f16b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /6.9.12.tar.gz /6.11.tar.gz /6.12.tar.gz +/6.14.3.tar.gz diff --git a/sources b/sources index 09eb7a0..073c0da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.12.tar.gz) = cfbeadef0f21c27060bf5a8b49182562bb3dbfb6c471bef73b9d1b799ea64da69f40dd1c8559436d2884b09892ef483fd98bdf896aa3b528b55d3ada347d329c +SHA512 (6.14.3.tar.gz) = 500a369f4c91272a78d3658675b9b0eb53aa071038181bf136801a63c86cb7bccdaf6597f9cf2de45a3f018f6cde1359744b2ac1df303511a3518f41e0f62acd diff --git a/testng.spec b/testng.spec index c2db5a3..6d24d9d 100644 --- a/testng.spec +++ b/testng.spec @@ -1,8 +1,8 @@ %bcond_without groovy Name: testng -Version: 6.12 -Release: 3%{?dist} +Version: 6.14.3 +Release: 1%{?dist} Summary: Java-based testing framework License: ASL 2.0 URL: http://testng.org/ @@ -98,6 +98,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Tue Mar 20 2018 Alexander Kurtakov 6.14.3-1 +- Update to upstream 6.14.3. + * Fri Feb 09 2018 Fedora Release Engineering - 6.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9ea33b5099559788daad211c6357882fe58407a8 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 20 Mar 2018 11:57:22 +0200 Subject: [PATCH 03/71] Bump maven pom version. --- pom.xml | 2 +- testng.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3646242..00cb59f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ testng jar TestNG - 6.12 + 6.14.3 TestNG is a testing framework. http://testng.org diff --git a/testng.spec b/testng.spec index 6d24d9d..c569b1a 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ Name: testng Version: 6.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java-based testing framework License: ASL 2.0 URL: http://testng.org/ @@ -98,6 +98,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Tue Mar 20 2018 Alexander Kurtakov 6.14.3-2 +- Bump maven pom version. + * Tue Mar 20 2018 Alexander Kurtakov 6.14.3-1 - Update to upstream 6.14.3. From 934a4052139176d6cfc26e333e2cc99153790c80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 07:27:32 +0000 Subject: [PATCH 04/71] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- testng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testng.spec b/testng.spec index c569b1a..f0aa554 100644 --- a/testng.spec +++ b/testng.spec @@ -2,7 +2,7 @@ Name: testng Version: 6.14.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework License: ASL 2.0 URL: http://testng.org/ @@ -98,6 +98,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/. %license LICENSE.txt %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 6.14.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Mar 20 2018 Alexander Kurtakov 6.14.3-2 - Bump maven pom version. From d672474cf273aa293d82a1d0236aaab1b739c062 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 17 Jul 2018 13:51:30 +0200 Subject: [PATCH 05/71] Allow conditionally building without snakeyaml --- testng.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) 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 From bf1d3be95546d3b056f3d2f42e667ab6742bb8f0 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 18 Jul 2018 15:19:55 +0200 Subject: [PATCH 06/71] Clean tarball from binaries, remove bundled jquery --- .gitignore | 1 + ...oid-accidental-javascript-in-javadoc.patch | 10 ++--- ...Replace-bundled-jquery-with-CDN-link.patch | 39 +++++++++++++++++++ generate-tarball.sh | 21 ++++++++++ sources | 2 +- testng.spec | 16 ++++++-- 6 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 0002-Replace-bundled-jquery-with-CDN-link.patch create mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index d27f16b..17ee1c1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /6.11.tar.gz /6.12.tar.gz /6.14.3.tar.gz +/testng-6.14.3.tar.gz diff --git a/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch index 8016b86..9df54e3 100644 --- a/0001-Avoid-accidental-javascript-in-javadoc.patch +++ b/0001-Avoid-accidental-javascript-in-javadoc.patch @@ -1,17 +1,17 @@ -From 214bd64764a48c5c3ad68829e0e35377f45ce221 Mon Sep 17 00:00:00 2001 +From bce3019741aeb785658b23095ae408a6c2d8ca35 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 +Subject: [PATCH 1/2] 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 +index 450678f..11543e3 100644 --- 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 { +@@ -245,7 +245,7 @@ public class TestNGContentHandler extends DefaultHandler { } /** @@ -21,5 +21,5 @@ index e36c413..da9a069 100755 private void xmlScript(boolean start, Attributes attributes) { if (start) { -- -2.9.4 +2.17.1 diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch new file mode 100644 index 0000000..e3c956e --- /dev/null +++ b/0002-Replace-bundled-jquery-with-CDN-link.patch @@ -0,0 +1,39 @@ +From 9155677e2d5acdd2379c38041189da52c7f04946 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Wed, 18 Jul 2018 15:57:49 +0200 +Subject: [PATCH 2/2] Replace bundled jquery with CDN link + +--- + src/main/java/org/testng/reporters/jq/Main.java | 2 +- + src/main/resources/org/testng/header | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main/java/org/testng/reporters/jq/Main.java b/src/main/java/org/testng/reporters/jq/Main.java +index cb83ff9..b691674 100644 +--- a/src/main/java/org/testng/reporters/jq/Main.java ++++ b/src/main/java/org/testng/reporters/jq/Main.java +@@ -19,7 +19,7 @@ import java.util.List; + public class Main implements IReporter { + private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/"; + private static final String[] RESOURCES = new String[] { +- "jquery-1.7.1.min.js", "testng-reports.css", "testng-reports.js", ++ "testng-reports.css", "testng-reports.js", + "passed.png", "failed.png", "skipped.png", "navigator-bullet.png", + "bullet_point.png", "collapseall.gif" + }; +diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header +index 47f897b..a302d47 100644 +--- a/src/main/resources/org/testng/header ++++ b/src/main/resources/org/testng/header +@@ -6,7 +6,7 @@ + TestNG reports + + +- ++ + + + -+ +- ++ + -+ +- ++ -+ +- ++