.gitignore

@@ -1 +1 @@
-SOURCES/testng-7.0.0.tar.gz
+SOURCES/testng-6.14.3.tar.gz

.testng.metadata

@@ -1 +1 @@
-9249508bc41850d68038bede149fc0ef87f5d7a5 SOURCES/testng-7.0.0.tar.gz
+e7510a2cd4e783abeaada27c992ae30e531d4fa8 SOURCES/testng-6.14.3.tar.gz

SOURCES/0001-Avoid-accidental-javascript-in-javadoc.patch

@@ -4,24 +4,22 @@ Date: Wed, 31 May 2017 13:44:36 +0200
 Subject: [PATCH 1/2] Avoid accidental javascript in javadoc
 
 ---
- src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ 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 b74572a..7c490e9 100644
+index 450678f..11543e3 100644
 --- a/src/main/java/org/testng/xml/TestNGContentHandler.java
 +++ b/src/main/java/org/testng/xml/TestNGContentHandler.java
-@@ -250,7 +250,9 @@ public class TestNGContentHandler extends DefaultHandler {
-     }
+@@ -245,7 +245,7 @@ public class TestNGContentHandler extends DefaultHandler {
    }
  
--  /** Parse <script> */
-+  /**
+   /**
+-   * Parse <script>
 +   * Parse &lt;script&gt;
-+   */
+    */
    private void xmlScript(boolean start, Attributes attributes) {
      if (start) {
-       m_currentLanguage = attributes.getValue("language");
 -- 
-2.20.1
+2.17.1
 

SOURCES/0002-Replace-bundled-jquery-with-CDN-link.patch

@@ -4,22 +4,23 @@ 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 | 1 -
+ src/main/java/org/testng/reporters/jq/Main.java | 2 +-
  src/main/resources/org/testng/header            | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
+ 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 1d3e950..3b5bc0d 100644
+index cb83ff9..b691674 100644
 --- a/src/main/java/org/testng/reporters/jq/Main.java
 +++ b/src/main/java/org/testng/reporters/jq/Main.java
-@@ -21,7 +21,6 @@ public class Main implements IReporter {
+@@ -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",
-         "passed.png",
+   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
@@ -34,5 +35,5 @@ index 47f897b..a302d47 100644
      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
      <script type='text/javascript'>
 -- 
-2.20.1
+2.17.1
 

SOURCES/generate-tarball.sh

@@ -3,15 +3,14 @@ set -e
 
 name=testng
 version="$(sed -n 's/Version:\s*//p' *.spec)"
-upstream_version="$(echo ${version} | tr '~' '-')"
 
 # RETRIEVE
-wget "https://github.com/cbeust/testng/archive/${upstream_version}.tar.gz" -O "${name}-${upstream_version}.orig.tar.gz"
+wget "https://github.com/cbeust/testng/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
 cd tarball-tmp
-tar xf "../${name}-${upstream_version}.orig.tar.gz"
+tar xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 rm -r */gradle* */kobalt*
@@ -19,4 +18,4 @@ rm */src/main/resources/org/testng/jquery-*.js
 
 tar cf "../${name}-${version}.tar.gz" *
 cd ..
-rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

SOURCES/pom.xml

@@ -1,3 +1,4 @@
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <!-- Refer to the file ./build-with-maven for instruction on how to use this pom.xml -->
@@ -7,7 +8,7 @@
   <artifactId>testng</artifactId>
   <packaging>jar</packaging>
   <name>TestNG</name>
-  <version>@VERSION@</version>
+  <version>6.14.3</version>
   <description>TestNG is a testing framework.</description>
   <url>http://testng.org</url>
     
@@ -136,8 +137,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
 

SPECS/testng.spec

@@ -1,6 +1,9 @@
+%bcond_without groovy
+%bcond_without snakeyaml
+
 Name:           testng
-Version:        7.0.0
-Release:        2%{?dist}
+Version:        6.14.3
+Release:        5%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -27,6 +30,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:)
+%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
@@ -41,12 +53,12 @@ Summary:        API documentation for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%(echo %{version} | tr '~' '-')
+%setup -q
 
 %patch0 -p1
 %patch1 -p1
 
-sed 's/@VERSION@/%{version}/' %{SOURCE1} > pom.xml
+cp %{SOURCE1} .
 
 # remove any bundled libs, but not test resources
 find ! -path "*/test/*" -name *.jar -print -delete
@@ -57,11 +69,23 @@ 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 \
+  "<executions><execution><goals><goal>addTestSources</goal><goal>testGenerateStubs</goal><goal>testCompile</goal><goal>removeTestStubs</goal></goals></execution></executions>"
+%pom_add_dep "org.assertj:assertj-core::test"
+%pom_add_dep "org.spockframework:spock-core::test"
+%pom_add_dep "org.codehaus.groovy:groovy-all::test"
+
+# remove failing test
+sed -i -e '/parallelDataProviderSample/,+12d' ./src/test/java/test/dataprovider/DataProviderTest.java
+%endif
 
 sed -i -e 's/DEV-SNAPSHOT/%{version}/' src/main/java/org/testng/internal/Version.java
 
@@ -72,7 +96,11 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %mvn_alias : :::jdk15:
 
 %build
+%if %{with groovy} && %{with snakeyaml}
+%mvn_build
+%else
 %mvn_build -f
+%endif
 
 %install
 %mvn_install
@@ -85,21 +113,6 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
-- Mass rebuild for javapackages-tools 201902
-
-* Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0-1
-- Update to upstream version 7.0.0
-
-* Wed Aug 14 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0~beta7-1
-- Update to upstream version 7.0.0~beta7
-
-* Thu Jun 06 2019 Marian Koncek <mkoncek@redhat.com> - 7.0.0~beta4-1
-- Update to upstream version 7.0.0~beta4
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.14.3-6
-- Mass rebuild for javapackages-tools 201901
-
 * Wed Jul 18 2018 Michael Simacek <msimacek@redhat.com> - 6.14.3-5
 - Clean tarball from binaries
 - Replace bundled jquery with CDN link