From bd64975b429435f1b1410e89cde092995fd2702c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 8 Jun 2021 20:17:56 +0200
Subject: [PATCH] Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482
---
 .gitignore                                    |  6 ++
 ...oid-accidental-javascript-in-javadoc.patch | 18 ++--
 ...Replace-bundled-jquery-with-CDN-link.patch | 35 ++++----
 generate-tarball.sh                           | 13 +--
 pom.xml                                       |  7 +-
 sources                                       |  2 +-
 testng.spec                                   | 82 +++++++++++--------
 7 files changed, 90 insertions(+), 73 deletions(-)

diff --git a/.gitignore b/.gitignore
index 17ee1c1..7f50cd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,9 @@
 /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
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..060f29f 100644
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ b/0002-Replace-bundled-jquery-with-CDN-link.patch
@@ -4,36 +4,35 @@ 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 f77bcaa..e5a8832 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-3.4.1.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 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" />
--    <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-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.17.1
+2.25.4
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 4947a6d..095faf1 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -3,19 +3,20 @@ 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"
+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 ..
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
+tar -czf "../${name}-${version}.tar.gz" *
+popd
+rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"
diff --git a/pom.xml b/pom.xml
index 49df702..051ea60 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>6.14.3</version>
+  <version>@VERSION@</version>
   <description>TestNG is a testing framework.</description>
   <url>http://testng.org</url>
     
@@ -131,8 +130,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..0f5c58c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-6.14.3.tar.gz) = cec176c1c886b4f8f54021910af4637004854e88f928496acd67b9bc1ea2c78bc86451f37b98269aa56d8ec88b2c0fb75fa5c3cf7ea72e19192f910dd8242cfa
+SHA512 (testng-7.3.0.tar.gz) = fee25ee1e146138ce30586969f99db493f23af8bda3b0add59cd44efe1cf81857c8bebb10e8b5eb67de627accf4c32aace525332c4147aad6cb4b2da05e1a92d
diff --git a/testng.spec b/testng.spec
index a7f0392..056ee6d 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,12 +1,16 @@
-%bcond_with    groovy
-%bcond_without snakeyaml
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
 
 Name:           testng
-Version:        6.14.3
-Release:        15%{?dist}
+Version:        7.3.0
+Release:        3%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
+
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
 
@@ -22,21 +26,15 @@ 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.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)
-%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
@@ -52,12 +50,12 @@ Summary:        API documentation for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%(echo %{version} | tr '~' '-')
 
 %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
@@ -68,23 +66,13 @@ 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"
+%pom_remove_dep :bsh
 
-# java.lang.NoClassDefFoundError: net/sf/cglib/proxy/CallbackFilter when executing tests
-%pom_add_dep "net.sf.cglib:cglib::test"
-%endif
+%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
 
@@ -95,13 +83,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %mvn_alias : :::jdk15:
 
 %build
-%if %{with groovy} && %{with snakeyaml}
-# A couple of parallelisation tests are *sometimes* failing, so let's ignore failures
-# because they do complete successfully most of the time
-%mvn_build -- -Dmaven.test.failure.ignore=true
-%else
 %mvn_build -f
-%endif
 
 %install
 %mvn_install
@@ -114,15 +96,28 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.14.3-15
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.3.0-3
+- Bootstrap Maven for CentOS Stream 9
+
+* 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
 
@@ -132,12 +127,27 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 * 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