.gitignore

@@ -1,28 +1 @@
-/noarch/
+SOURCES/testng-7.0.0.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 @@
+9249508bc41850d68038bede149fc0ef87f5d7a5 SOURCES/testng-7.0.0.tar.gz

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

@@ -9,30 +9,30 @@ Subject: [PATCH 2/2] Replace bundled jquery with CDN link
  2 files changed, 1 insertion(+), 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 1d3e950..3b5bc0d 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 {
    private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
    private static final String[] RESOURCES =
        new String[] {
--        "jquery.min.js",
+-        "jquery-1.7.1.min.js",
          "testng-reports.css",
          "testng-reports.js",
-         "testng-reports1.css",
+         "passed.png",
 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.20.1
 

SOURCES/generate-tarball.sh

@@ -10,13 +10,13 @@ wget "https://github.com/cbeust/testng/archive/${upstream_version}.tar.gz" -O "$
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
-pushd tarball-tmp
+cd tarball-tmp
-tar -xf "../${name}-${upstream_version}.orig.tar.gz"
+tar xf "../${name}-${upstream_version}.orig.tar.gz"
 
 # CLEAN TARBALL
-rm -r */bin*
+rm -r */gradle* */kobalt*
-rm -r */gradle*
+rm */src/main/resources/org/testng/jquery-*.js
 
-tar -czf "../${name}-${version}.tar.gz" *
+tar cf "../${name}-${version}.tar.gz" *
-popd
+cd ..
 rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"

SOURCES/pom.xml

@@ -31,6 +31,12 @@
     </developer>
   </developers>
 
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>3</version>
+  </parent>
+
   <distributionManagement>
     <repository>
       <id>bintray</id>

SPECS/testng.spec

@@ -1,12 +1,9 @@
-%bcond_with bootstrap
-
 Name:           testng
-Version:        7.4.0
+Version:        7.0.0
-Release:        4%{?dist}
+Release:        2%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
-
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 
@@ -20,19 +17,16 @@ 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)
-%endif
+BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
 TestNG is a testing framework inspired from JUnit and NUnit but introducing
@@ -67,9 +61,7 @@ find -name *.class -delete
 rm src/main/java/org/testng/internal/Yaml*.java
 rm src/main/java/org/testng/Converter.java
 
-%pom_remove_dep :bsh
+# missing test deps
-
-%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "<classifier>no_aop</classifier>"
 
 sed -i -e 's/DEV-SNAPSHOT/%{version}/' src/main/java/org/testng/internal/Version.java
 
@@ -93,49 +85,6 @@ 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
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* 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
 
@@ -145,24 +94,12 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 * 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
 - Replace bundled jquery with CDN link

sources

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