.gitignore

@@ -1,28 +1 @@
-/noarch/
+SOURCES/testng-6.14.3.tar.gz
-/.build-*.log
-/*.src.rpm
-/testng-6.0.1.tar.xz
-/testng-6.8.tar.gz
-/testng-6.8.5.tar.gz
-/testng-6.8.7.tar.gz
-/testng-6.8.8.tar.gz
-/testng-6.8.14.tar.gz
-/testng-6.8.17.tar.gz
-/testng-6.8.21.tar.gz
-/testng-6.9.5.tar.gz
-/6.9.8.tar.gz
-/6.9.9.tar.gz
-/6.9.10.tar.gz
-/6.9.11.tar.gz
-/6.9.12.tar.gz
-/6.11.tar.gz
-/6.12.tar.gz
-/6.14.3.tar.gz
-/testng-6.14.3.tar.gz
-/testng-7.0.0~beta4.tar.gz
-/testng-7.0.0~beta7.tar.gz
-/testng-7.0.0.tar.gz
-/testng-7.1.1.tar.gz
-/testng-7.2.0~SNAPSHOT.tar.gz
-/testng-7.3.0.tar.gz
-/testng-7.4.0.tar.gz

.testng.metadata

@@ -0,0 +1 @@
+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 +++-
+ src/main/java/org/testng/xml/TestNGContentHandler.java | 2 +-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ 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,35 +4,36 @@ 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 efd6799..2d8b74e 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 =
+   private static final String[] RESOURCES = new String[] {
-       new String[] {
+-    "jquery-1.7.1.min.js", "testng-reports.css", "testng-reports.js",
--        "jquery.min.js",
++    "testng-reports.css", "testng-reports.js",
-         "testng-reports.css",
+     "passed.png", "failed.png", "skipped.png", "navigator-bullet.png",
-         "testng-reports.js",
+     "bullet_point.png", "collapseall.gif"
-         "testng-reports1.css",
+   };
 diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header
-index f5abbc3..817badc 100644
+index 47f897b..a302d47 100644
 --- a/src/main/resources/org/testng/header
 +++ b/src/main/resources/org/testng/header
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
+   <title>TestNG reports</title>
  
-     <link type="text/css" href="testng-reports1.css" rel="stylesheet" id="ultra" />
+     <link type="text/css" href="testng-reports.css" rel="stylesheet" />
-     <link type="text/css" href="testng-reports.css" rel="stylesheet" id="retro" disabled="false"/>
+-    <script type="text/javascript" src="jquery-1.7.1.min.js"></script>
--    <script type="text/javascript" src="jquery.min.js"></script>
++    <script type="text/javascript" src="https://code.jquery.com/jquery-1.7.1.min.js"></script>
-+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
      <script type="text/javascript" src="testng-reports.js"></script>
      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
      <script type='text/javascript'>
 -- 
-2.31.1
+2.17.1
 

SOURCES/generate-tarball.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+name=testng
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+# RETRIEVE
+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}-${version}.orig.tar.gz"
+
+# CLEAN TARBALL
+rm -r */gradle* */kobalt*
+rm */src/main/resources/org/testng/jquery-*.js
+
+tar cf "../${name}-${version}.tar.gz" *
+cd ..
+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>
     
@@ -31,6 +32,12 @@
     </developer>
   </developers>
 
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>3</version>
+  </parent>
+
   <distributionManagement>
     <repository>
       <id>bintray</id>
@@ -130,8 +137,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.8</source>
+          <source>1.7</source>
-          <target>1.8</target>
+          <target>1.7</target>
         </configuration>
       </plugin>
 

SPECS/testng.spec

@@ -1,12 +1,12 @@
-%bcond_with bootstrap
+%bcond_without groovy
+%bcond_without snakeyaml
 
 Name:           testng
-Version:        7.4.0
+Version:        6.14.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
-
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 
@@ -20,18 +20,24 @@ Patch0:         0001-Avoid-accidental-javascript-in-javadoc.patch
 Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
 
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.beust:jcommander)
+BuildRequires:  mvn(com.google.inject:guice)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(com.google.inject:guice::no_aop:)
 BuildRequires:  mvn(junit:junit)
 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
@@ -47,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
@@ -63,13 +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
 
-%pom_remove_dep :bsh
+# 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"
 
-%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "<classifier>no_aop</classifier>"
+# 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
 
@@ -80,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
@@ -93,75 +113,8 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-4
+* Tue Dec 12 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.14.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+- Rebuilt for MSVSphere 8.8
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 7.4.0-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Nov 08 2021 Marian Koncek <mkoncek@redhat.com> - 7.4.0-1
-- Update to upstream version 7.4.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.3.0-2
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Sep 30 2020 Marian Koncek <mkoncek@redhat.com> - 7.3.0-1
-- Update to upstream version 7.3.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.2.0~SNAPSHOT-1
-- Update to upstream version 7.2.0~SNAPSHOT
-
-* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.1.1-1
-- Update to upstream version 7.1.1
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 6.14.3-12
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Feb 19 2020 Fabio Valentini <decathorpe@gmail.com> - 6.14.3-11
-- Drop unnecessary dependency on parent POM.
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* 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
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 23 2019 Fabio Valentini <decathorpe@gmail.com> - 6.14.3-8
-- Disable groovy support by default.
-
-* 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
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Dec 13 2018 Mat Booth <mat.booth@redhat.com> - 6.14.3-6
-- Fix test suite execution
 
 * Wed Jul 18 2018 Michael Simacek <msimacek@redhat.com> - 6.14.3-5
 - Clean tarball from binaries

generate-tarball.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-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"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-pushd tarball-tmp
-tar -xf "../${name}-${upstream_version}.orig.tar.gz"
-
-# CLEAN TARBALL
-rm -r */bin*
-rm -r */gradle*
-
-tar -czf "../${name}-${version}.tar.gz" *
-popd
-rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"

sources

@@ -1 +0,0 @@
-SHA512 (testng-7.4.0.tar.gz) = 7cb2c47e4169c56f7b65c8213af1b88b516d4f6d84a5e3046c83a543c5124689cc95197cb291856c408784a78a8b7d1aae1fb5c426bd7e61c42504e5f92d65db