Update to upstream version 7.4.0

Resolves: rhbz#1785554

.gitignore

@@ -25,3 +25,4 @@
 /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

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 f77bcaa..e5a8832 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-3.4.1.min.js",
+-        "jquery.min.js",
          "testng-reports.css",
          "testng-reports.js",
          "testng-reports1.css",
 diff --git a/src/main/resources/org/testng/header b/src/main/resources/org/testng/header
-index e69a4be..1a1af79 100644
+index f5abbc3..817badc 100644
 --- a/src/main/resources/org/testng/header
 +++ b/src/main/resources/org/testng/header
 @@ -7,7 +7,7 @@
  
      <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-3.4.1.min.js"></script>
+-    <script type="text/javascript" src="jquery.min.js"></script>
-+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.4.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.25.4
+2.31.1
 

generate-tarball.sh

@@ -14,8 +14,8 @@ pushd tarball-tmp
 tar -xf "../${name}-${upstream_version}.orig.tar.gz"
 
 # CLEAN TARBALL
-rm -r */gradle* */kobalt*
+rm -r */bin*
-rm */src/main/resources/org/testng/jquery-*.js
+rm -r */gradle*
 
 tar -czf "../${name}-${version}.tar.gz" *
 popd

sources

@@ -1 +1 @@
-SHA512 (testng-7.3.0.tar.gz) = fee25ee1e146138ce30586969f99db493f23af8bda3b0add59cd44efe1cf81857c8bebb10e8b5eb67de627accf4c32aace525332c4147aad6cb4b2da05e1a92d
+SHA512 (testng-7.4.0.tar.gz) = 7cb2c47e4169c56f7b65c8213af1b88b516d4f6d84a5e3046c83a543c5124689cc95197cb291856c408784a78a8b7d1aae1fb5c426bd7e61c42504e5f92d65db

testng.spec

@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           testng
-Version:        7.3.0
+Version:        7.4.0
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -92,6 +92,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* 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