.gitignore

@@ -1 +0,0 @@
-SOURCES/testng-7.0.0.tar.gz

.testng.metadata

@@ -1 +1,2 @@
-9249508bc41850d68038bede149fc0ef87f5d7a5 SOURCES/testng-7.0.0.tar.gz
+2870e287330f9c1c911848344fc91904afee34f4 SOURCES/testng-7.4.0.tar.gz
+e24e9ff5ea5ff241db4251b8d90bfdac381a651b SOURCES/generate-tarball.sh

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 1d3e950..3b5bc0d 100644
+index efd6799..2d8b74e 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-1.7.1.min.js",
+-        "jquery.min.js",
          "testng-reports.css",
          "testng-reports.js",
-         "passed.png",
+         "testng-reports1.css",
 diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header
-index 47f897b..a302d47 100644
+index f5abbc3..817badc 100644
 --- a/src/main/resources/org/testng/header
 +++ b/src/main/resources/org/testng/header
-@@ -6,7 +6,7 @@
-   <title>TestNG reports</title>
+@@ -7,7 +7,7 @@
  
-     <link type="text/css" href="testng-reports.css" rel="stylesheet" />
--    <script type="text/javascript" src="jquery-1.7.1.min.js"></script>
-+    <script type="text/javascript" src="https://code.jquery.com/jquery-1.7.1.min.js"></script>
+     <link type="text/css" href="testng-reports1.css" rel="stylesheet" id="ultra" />
+     <link type="text/css" href="testng-reports.css" rel="stylesheet" id="retro" disabled="false"/>
+-    <script type="text/javascript" src="jquery.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.20.1
+2.31.1
 

SOURCES/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
-cd tarball-tmp
-tar xf "../${name}-${upstream_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}-${upstream_version}.orig.tar.gz"

SOURCES/pom.xml

@@ -31,12 +31,6 @@
     </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,9 +1,12 @@
+%bcond_with bootstrap
+
 Name:           testng
-Version:        7.0.0
-Release:        2%{?dist}
+Version:        7.4.0
+Release:        4%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
+
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 
@@ -17,16 +20,19 @@ 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:)
+%endif
 
 %description
 TestNG is a testing framework inspired from JUnit and NUnit but introducing
@@ -61,7 +67,9 @@ find -name *.class -delete
 rm src/main/java/org/testng/internal/Yaml*.java
 rm src/main/java/org/testng/Converter.java
 
-# missing test deps
+%pom_remove_dep :bsh
+
+%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
 
@@ -85,6 +93,49 @@ 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
 
@@ -94,12 +145,24 @@ 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