From 548e2390fc0ce7fd44ce98b1f5ea4dfbe0a3ba3d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 29 Nov 2018 12:42:46 +0000
Subject: [PATCH 01/14] Expand conditionals

---
 testng.spec | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/testng.spec b/testng.spec
index 7c089e3..204fcf1 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,5 +1,3 @@
-%bcond_without groovy
-%bcond_without snakeyaml
 
 Name:           testng
 Version:        6.14.3
@@ -30,15 +28,6 @@ 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
@@ -69,23 +58,11 @@ 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
 
@@ -96,11 +73,7 @@ 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

From 8a4d08fe8eb0e5656f0e9c0eac317f06b6d7fb25 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 24 May 2019 17:01:44 +0200
Subject: [PATCH 02/14] Mass rebuild for javapackages-tools 201901

---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 204fcf1..016f5b1 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,7 +1,7 @@
 
 Name:           testng
 Version:        6.14.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -86,6 +86,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* 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

From 96bc7486dcc179d5a333733799662cba74c9ac2c Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 6 Jun 2019 14:19:34 +0200
Subject: [PATCH 03/14] Update to upstream version 7.0.0~beta4

---
 .gitignore                                    |  1 +
 ...oid-accidental-javascript-in-javadoc.patch | 18 ++++++++-------
 ...Replace-bundled-jquery-with-CDN-link.patch | 23 +++++++++----------
 generate-tarball.sh                           |  7 +++---
 pom.xml                                       |  4 ++--
 sources                                       |  2 +-
 testng.spec                                   | 10 ++++----
 7 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 17ee1c1..46e5c91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /6.12.tar.gz
 /6.14.3.tar.gz
 /testng-6.14.3.tar.gz
+/testng-7.0.0~beta4.tar.gz
diff --git a/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch
index 9df54e3..fc97728 100644
--- a/0001-Avoid-accidental-javascript-in-javadoc.patch
+++ b/0001-Avoid-accidental-javascript-in-javadoc.patch
@@ -4,22 +4,24 @@ 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 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java
-index 450678f..11543e3 100644
+index b74572a..7c490e9 100644
 --- a/src/main/java/org/testng/xml/TestNGContentHandler.java
 +++ b/src/main/java/org/testng/xml/TestNGContentHandler.java
-@@ -245,7 +245,7 @@ public class TestNGContentHandler extends DefaultHandler {
+@@ -250,7 +250,9 @@ 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.17.1
+2.20.1
 
diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch
index e3c956e..bab0173 100644
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ b/0002-Replace-bundled-jquery-with-CDN-link.patch
@@ -4,23 +4,22 @@ 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 | 2 +-
+ src/main/java/org/testng/reporters/jq/Main.java | 1 -
  src/main/resources/org/testng/header            | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 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 cb83ff9..b691674 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
-@@ -19,7 +19,7 @@ import java.util.List;
- public class Main implements IReporter {
+@@ -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", "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"
-   };
+   private static final String[] RESOURCES =
+       new String[] {
+-        "jquery-1.7.1.min.js",
+         "testng-reports.css",
+         "testng-reports.js",
+         "passed.png",
 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
@@ -35,5 +34,5 @@ index 47f897b..a302d47 100644
      <script type="text/javascript" src="https://www.google.com/jsapi"></script>
      <script type='text/javascript'>
 -- 
-2.17.1
+2.20.1
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 4947a6d..119d648 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -3,14 +3,15 @@ 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/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+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}-${version}.orig.tar.gz"
+tar xf "../${name}-${upstream_version}.orig.tar.gz"
 
 # CLEAN TARBALL
 rm -r */gradle* */kobalt*
@@ -18,4 +19,4 @@ rm */src/main/resources/org/testng/jquery-*.js
 
 tar cf "../${name}-${version}.tar.gz" *
 cd ..
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
+rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"
diff --git a/pom.xml b/pom.xml
index 00cb59f..da8dab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,8 +137,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
diff --git a/sources b/sources
index 0055bc4..75a6a5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-6.14.3.tar.gz) = cec176c1c886b4f8f54021910af4637004854e88f928496acd67b9bc1ea2c78bc86451f37b98269aa56d8ec88b2c0fb75fa5c3cf7ea72e19192f910dd8242cfa
+SHA512 (testng-7.0.0~beta4.tar.gz) = 39b50d6f5b677830e0e11c5d5fc5667f92f0ffb75fa8be96e33c87f642398e687396ad71826fbc6c04088470d7bb5fd1ff12672e348e83119982e759bfa1e2fb
diff --git a/testng.spec b/testng.spec
index 016f5b1..35ea15f 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,7 +1,6 @@
-
 Name:           testng
-Version:        6.14.3
-Release:        6%{?dist}
+Version:        7.0.0~beta4
+Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -42,7 +41,7 @@ Summary:        API documentation for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-7.0.0-beta4
 
 %patch0 -p1
 %patch1 -p1
@@ -86,6 +85,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* 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
 

From 14cd4b711f246a0d2732775b1f203ffa50f51ced Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 14 Aug 2019 10:38:47 +0200
Subject: [PATCH 04/14] Update to upstream version 7.0.0~beta7

---
 .gitignore  | 1 +
 pom.xml     | 2 +-
 sources     | 2 +-
 testng.spec | 7 +++++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 46e5c91..63f0164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /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
diff --git a/pom.xml b/pom.xml
index da8dab7..b37436e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>testng</artifactId>
   <packaging>jar</packaging>
   <name>TestNG</name>
-  <version>6.14.3</version>
+  <version>7.0.0-beta7</version>
   <description>TestNG is a testing framework.</description>
   <url>http://testng.org</url>
     
diff --git a/sources b/sources
index 75a6a5e..42e5cab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-7.0.0~beta4.tar.gz) = 39b50d6f5b677830e0e11c5d5fc5667f92f0ffb75fa8be96e33c87f642398e687396ad71826fbc6c04088470d7bb5fd1ff12672e348e83119982e759bfa1e2fb
+SHA512 (testng-7.0.0~beta7.tar.gz) = 5cb8bc5c10e680f29c99314201097454eba9965a7ba67a27f5859e361544b9f21ccf257afdd40fed1d0b6b97316e58cff29dcc0bce464ac81625188489cd2338
diff --git a/testng.spec b/testng.spec
index 35ea15f..7864552 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,5 +1,5 @@
 Name:           testng
-Version:        7.0.0~beta4
+Version:        7.0.0~beta7
 Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
@@ -41,7 +41,7 @@ Summary:        API documentation for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-7.0.0-beta4
+%setup -q -n %{name}-%(echo %{version} | tr '~' '-')
 
 %patch0 -p1
 %patch1 -p1
@@ -85,6 +85,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* 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
 

From 20ba641b50076f52bbe64869b2e23c66bbb15b75 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 2 Sep 2019 09:11:45 +0200
Subject: [PATCH 05/14] Update to upstream version 7.0.0

---
 .gitignore  | 1 +
 pom.xml     | 3 +--
 sources     | 2 +-
 testng.spec | 7 +++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 63f0164..0bd6f4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 /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
diff --git a/pom.xml b/pom.xml
index b37436e..2c8eddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,3 @@
-
 <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 -->
@@ -8,7 +7,7 @@
   <artifactId>testng</artifactId>
   <packaging>jar</packaging>
   <name>TestNG</name>
-  <version>7.0.0-beta7</version>
+  <version>@VERSION@</version>
   <description>TestNG is a testing framework.</description>
   <url>http://testng.org</url>
     
diff --git a/sources b/sources
index 42e5cab..85f8f51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-7.0.0~beta7.tar.gz) = 5cb8bc5c10e680f29c99314201097454eba9965a7ba67a27f5859e361544b9f21ccf257afdd40fed1d0b6b97316e58cff29dcc0bce464ac81625188489cd2338
+SHA512 (testng-7.0.0.tar.gz) = fdd62f26a82010b8990c88789d369d31f188e0651afdcc0d61c634e4fa1094671eacd14ac436bb65a8f3a4c744c275d7d0542b5365c4a1a6c18d8794a5314d62
diff --git a/testng.spec b/testng.spec
index 7864552..430bb17 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,5 +1,5 @@
 Name:           testng
-Version:        7.0.0~beta7
+Version:        7.0.0
 Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
@@ -46,7 +46,7 @@ This package contains the API documentation for %{name}.
 %patch0 -p1
 %patch1 -p1
 
-cp %{SOURCE1} .
+sed 's/@VERSION@/%{version}/' %{SOURCE1} > pom.xml
 
 # remove any bundled libs, but not test resources
 find ! -path "*/test/*" -name *.jar -print -delete
@@ -85,6 +85,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* 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
 

From 979ced6428773c63e10b5213ce348ea2a55134ed Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 5 Nov 2019 17:29:28 +0100
Subject: [PATCH 06/14] Mass rebuild for javapackages-tools 201902

---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 430bb17..1d1dd24 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,6 +1,6 @@
 Name:           testng
 Version:        7.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -85,6 +85,9 @@ 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
 

From 71d80a1171cb376c2d11bc239194bde58aaf11b6 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 27 Jan 2020 16:33:48 +0100
Subject: [PATCH 07/14] Properly compress tarballs

---
 generate-tarball.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generate-tarball.sh b/generate-tarball.sh
index 119d648..e1b0a75 100755
--- a/generate-tarball.sh
+++ b/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
-cd tarball-tmp
+pushd 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 ..
+tar -czf "../${name}-${version}.tar.gz" *
+popd
 rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"

From e5de90238169fff1ca5f5058cec00d7d2b7687f9 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 21 Apr 2020 06:11:20 +0200
Subject: [PATCH 08/14] Remove dependency on beanshell

---
 testng.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testng.spec b/testng.spec
index 1d1dd24..03526ae 100644
--- a/testng.spec
+++ b/testng.spec
@@ -20,11 +20,10 @@ BuildArch:      noarch
 
 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)
 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:)
 
@@ -61,6 +60,8 @@ 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
 
 sed -i -e 's/DEV-SNAPSHOT/%{version}/' src/main/java/org/testng/internal/Version.java

From c2b902c2e3fb408ff458e631dd0d1e34ca6a0f8a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 17 May 2020 08:55:11 +0200
Subject: [PATCH 09/14] Use NO_AOP guice variant

---
 testng.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 03526ae..c40bc4b 100644
--- a/testng.spec
+++ b/testng.spec
@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.beust:jcommander)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(com.google.inject:guice)
+BuildRequires:  mvn(com.google.inject:guice::no_aop:)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
@@ -62,6 +62,8 @@ rm src/main/java/org/testng/Converter.java
 
 %pom_remove_dep :bsh
 
+%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "<classifier>no_aop</classifier>"
+
 # missing test deps
 
 sed -i -e 's/DEV-SNAPSHOT/%{version}/' src/main/java/org/testng/internal/Version.java

From b2bfe6b195b60610846a5ba046d73f4fb6ddfebd Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 29 Jul 2020 11:00:10 +0200
Subject: [PATCH 10/14] Update to upstream version 7.1.1

---
 .gitignore                                      | 1 +
 0002-Replace-bundled-jquery-with-CDN-link.patch | 6 +++---
 generate-tarball.sh                             | 2 +-
 sources                                         | 2 +-
 testng.spec                                     | 7 +++++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0bd6f4e..f9f6ea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /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
diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch
index bab0173..86835d6 100644
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ b/0002-Replace-bundled-jquery-with-CDN-link.patch
@@ -16,7 +16,7 @@ index 1d3e950..3b5bc0d 100644
    private static final String TESTNG_RESOURCE_PREFIX = "/org/testng/";
    private static final String[] RESOURCES =
        new String[] {
--        "jquery-1.7.1.min.js",
+-        "jquery-3.4.1.min.js",
          "testng-reports.css",
          "testng-reports.js",
          "passed.png",
@@ -28,8 +28,8 @@ index 47f897b..a302d47 100644
    <title>TestNG reports</title>
  
      <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>
+-    <script type="text/javascript" src="jquery-3.4.1.min.js"></script>
++    <script type="text/javascript" src="https://code.jquery.com/jquery-3.4.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'>
diff --git a/generate-tarball.sh b/generate-tarball.sh
index e1b0a75..095faf1 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -11,7 +11,7 @@ wget "https://github.com/cbeust/testng/archive/${upstream_version}.tar.gz" -O "$
 rm -rf tarball-tmp
 mkdir tarball-tmp
 pushd tarball-tmp
-tar xf "../${name}-${upstream_version}.orig.tar.gz"
+tar -xf "../${name}-${upstream_version}.orig.tar.gz"
 
 # CLEAN TARBALL
 rm -r */gradle* */kobalt*
diff --git a/sources b/sources
index 85f8f51..e151aee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-7.0.0.tar.gz) = fdd62f26a82010b8990c88789d369d31f188e0651afdcc0d61c634e4fa1094671eacd14ac436bb65a8f3a4c744c275d7d0542b5365c4a1a6c18d8794a5314d62
+SHA512 (testng-7.1.1.tar.gz) = 7425db73db201297e09262eec83992cf7f649dd969da9a2c38646941f13a9f138caa89525afc5c39cc97f9edb9820f89e7456e7adc7fe036b668e502f7a5a9aa
diff --git a/testng.spec b/testng.spec
index c40bc4b..d57e2cc 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,6 +1,6 @@
 Name:           testng
-Version:        7.0.0
-Release:        2%{?dist}
+Version:        7.1.1
+Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -88,6 +88,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.1.1-1
+- Update to upstream version 7.1.1
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-2
 - Mass rebuild for javapackages-tools 201902
 

From 645e4246345386ec1c133e21a79cf23767dcf51a Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 29 Jul 2020 13:52:40 +0200
Subject: [PATCH 11/14] Update to upstream version 7.2.0~SNAPSHOT

---
 .gitignore                                    |  1 +
 ...Replace-bundled-jquery-with-CDN-link.patch | 14 ++++++-------
 generate-tarball-REMOVE.sh                    | 21 +++++++++++++++++++
 sources                                       |  2 +-
 testng.spec                                   | 14 +++++++++++--
 5 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100755 generate-tarball-REMOVE.sh

diff --git a/.gitignore b/.gitignore
index f9f6ea7..ba6bf31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /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
diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch
index 86835d6..060f29f 100644
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ b/0002-Replace-bundled-jquery-with-CDN-link.patch
@@ -9,7 +9,7 @@ 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 f77bcaa..e5a8832 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,20 +19,20 @@ index 1d3e950..3b5bc0d 100644
 -        "jquery-3.4.1.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 e69a4be..1a1af79 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" />
+     <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="https://code.jquery.com/jquery-3.4.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.25.4
 
diff --git a/generate-tarball-REMOVE.sh b/generate-tarball-REMOVE.sh
new file mode 100755
index 0000000..be074b1
--- /dev/null
+++ b/generate-tarball-REMOVE.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -ex
+
+name=testng
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+upstream_version="$(echo ${version} | tr '~' '-')"
+
+# RETRIEVE
+rm -rf testng
+git clone https://github.com/cbeust/testng.git
+mv testng "${name}-${upstream_version}"
+
+# CLEAN TARBALL
+rm -rf "${name}-${upstream_version}"/.git
+rm -rf "${name}-${upstream_version}"/.github
+rm -r "${name}-${upstream_version}"/gradle*
+rm -r "${name}-${upstream_version}"/kobalt*
+rm "${name}-${upstream_version}"/src/main/resources/org/testng/jquery-*.js
+
+tar -czf "${name}-${version}.tar.gz" "${name}-${upstream_version}"
+rm -rf "${name}-${upstream_version}"
diff --git a/sources b/sources
index e151aee..4ec3361 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-7.1.1.tar.gz) = 7425db73db201297e09262eec83992cf7f649dd969da9a2c38646941f13a9f138caa89525afc5c39cc97f9edb9820f89e7456e7adc7fe036b668e502f7a5a9aa
+SHA512 (testng-7.2.0~SNAPSHOT.tar.gz) = 57f854b7828dd88e0c66714a8b385d9e18885d3677c36cc820f018b4da70765d0acd4b2de9d7f0f231131f002559c1a2e9ec830de18b9ec6b79c34791c97e244
diff --git a/testng.spec b/testng.spec
index d57e2cc..8a985c6 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,10 +1,15 @@
 Name:           testng
-Version:        7.1.1
+Version:        7.2.0~SNAPSHOT
 Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
-# ./generate-tarball.sh
+
+# TODO Remove after a proper release of version 7.2.0
+# This script downloads the current snapshot using git
+# ./generate-tarball-REMOVE.sh
+
+## ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 
 # Allows building with maven instead of gradle
@@ -13,6 +18,8 @@ Source1:        pom.xml
 # Remove bundled binaries to make sure we don't ship anything forbidden
 Source2:        generate-tarball.sh
 
+Source999:      generate-tarball-REMOVE.sh
+
 Patch0:         0001-Avoid-accidental-javascript-in-javadoc.patch
 Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
 
@@ -88,6 +95,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* 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
 

From c760b2e5ea2c49f9024b7cc2372f704def66e9bb Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 30 Sep 2020 16:38:24 +0200
Subject: [PATCH 12/14] Update to upstream version 7.3.0

---
 .gitignore                 |  1 +
 generate-tarball-REMOVE.sh | 21 ---------------------
 sources                    |  2 +-
 testng.spec                | 13 +++++--------
 4 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100755 generate-tarball-REMOVE.sh

diff --git a/.gitignore b/.gitignore
index ba6bf31..7f50cd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /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
diff --git a/generate-tarball-REMOVE.sh b/generate-tarball-REMOVE.sh
deleted file mode 100755
index be074b1..0000000
--- a/generate-tarball-REMOVE.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -ex
-
-name=testng
-version="$(sed -n 's/Version:\s*//p' *.spec)"
-upstream_version="$(echo ${version} | tr '~' '-')"
-
-# RETRIEVE
-rm -rf testng
-git clone https://github.com/cbeust/testng.git
-mv testng "${name}-${upstream_version}"
-
-# CLEAN TARBALL
-rm -rf "${name}-${upstream_version}"/.git
-rm -rf "${name}-${upstream_version}"/.github
-rm -r "${name}-${upstream_version}"/gradle*
-rm -r "${name}-${upstream_version}"/kobalt*
-rm "${name}-${upstream_version}"/src/main/resources/org/testng/jquery-*.js
-
-tar -czf "${name}-${version}.tar.gz" "${name}-${upstream_version}"
-rm -rf "${name}-${upstream_version}"
diff --git a/sources b/sources
index 4ec3361..0f5c58c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-7.2.0~SNAPSHOT.tar.gz) = 57f854b7828dd88e0c66714a8b385d9e18885d3677c36cc820f018b4da70765d0acd4b2de9d7f0f231131f002559c1a2e9ec830de18b9ec6b79c34791c97e244
+SHA512 (testng-7.3.0.tar.gz) = fee25ee1e146138ce30586969f99db493f23af8bda3b0add59cd44efe1cf81857c8bebb10e8b5eb67de627accf4c32aace525332c4147aad6cb4b2da05e1a92d
diff --git a/testng.spec b/testng.spec
index 8a985c6..9f2072c 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,15 +1,11 @@
 Name:           testng
-Version:        7.2.0~SNAPSHOT
+Version:        7.3.0
 Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
 
-# TODO Remove after a proper release of version 7.2.0
-# This script downloads the current snapshot using git
-# ./generate-tarball-REMOVE.sh
-
-## ./generate-tarball.sh
+# ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 
 # Allows building with maven instead of gradle
@@ -18,8 +14,6 @@ Source1:        pom.xml
 # Remove bundled binaries to make sure we don't ship anything forbidden
 Source2:        generate-tarball.sh
 
-Source999:      generate-tarball-REMOVE.sh
-
 Patch0:         0001-Avoid-accidental-javascript-in-javadoc.patch
 Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
 
@@ -95,6 +89,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Wed Sep 30 2020 Marian Koncek <mkoncek@redhat.com> - 7.3.0-1
+- Update to upstream version 7.3.0
+
 * Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 7.2.0~SNAPSHOT-1
 - Update to upstream version 7.2.0~SNAPSHOT
 

From 54a6d3a8325e68125ba594b172a9ca034062ab93 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 16 Apr 2021 15:33:13 +0200
Subject: [PATCH 13/14] Conditionalize buildrequires in bootstrap mode

---
 testng.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/testng.spec b/testng.spec
index 9f2072c..049608c 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,3 +1,5 @@
+%bcond_without bootstrap
+
 Name:           testng
 Version:        7.3.0
 Release:        1%{?dist}
@@ -20,6 +22,9 @@ Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
 BuildArch:      noarch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(com.beust:jcommander)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(com.google.inject:guice::no_aop:)
@@ -27,6 +32,7 @@ BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 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

From 581742d48ea66363b6fddebc2d033cd923a57453 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 13 May 2021 19:08:43 +0200
Subject: [PATCH 14/14] Turn off bootstrap mode by default

---
 testng.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 049608c..3755241 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 Name:           testng
 Version:        7.3.0