From ab7282b3d08c898157807122e4402cb0f17f8232 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 8 Nov 2021 14:09:07 +0100
Subject: [PATCH 01/39] Update to upstream version 7.4.0 Resolves: rhbz#1785554

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

diff --git a/.gitignore b/.gitignore
index 7f50cd8..d5fa4b3 100644
--- a/.gitignore
+++ b/.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
diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch
index 060f29f..d854bce 100644
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ b/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="https://code.jquery.com/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.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
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 095faf1..9857a89 100755
--- a/generate-tarball.sh
+++ b/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 */src/main/resources/org/testng/jquery-*.js
+rm -r */bin*
+rm -r */gradle*
 
 tar -czf "../${name}-${version}.tar.gz" *
 popd
diff --git a/sources b/sources
index 0f5c58c..ec3490d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (testng-7.3.0.tar.gz) = fee25ee1e146138ce30586969f99db493f23af8bda3b0add59cd44efe1cf81857c8bebb10e8b5eb67de627accf4c32aace525332c4147aad6cb4b2da05e1a92d
+SHA512 (testng-7.4.0.tar.gz) = 7cb2c47e4169c56f7b65c8213af1b88b516d4f6d84a5e3046c83a543c5124689cc95197cb291856c408784a78a8b7d1aae1fb5c426bd7e61c42504e5f92d65db
diff --git a/testng.spec b/testng.spec
index 3f2b691..11a54a1 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           testng
-Version:        7.3.0
-Release:        3%{?dist}
+Version:        7.4.0
+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
 

From 3095c2e54eee0f5f1d1ae980993d289c332a450b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 02:32:59 +0000
Subject: [PATCH 02/39] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 11a54a1..dd23dd3 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.4.0
-Release:        1%{?dist}
+Release:        2%{?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
+* 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
 

From 82e3f86ef7a523862522a422f41c505d5ec2e2e0 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sun, 6 Feb 2022 00:26:31 +0100
Subject: [PATCH 03/39] Rebuilt for java-17-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java17
---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index dd23dd3..b313c9a 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.4.0
-Release:        2%{?dist}
+Release:        3%{?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
+* 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
 

From cbd05ef1b159aa250bbaa0dee0b5a9bbedb54c1d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 12 May 2022 22:33:24 +0200
Subject: [PATCH 04/39] Add ExclusiveArch: %{java_arches} noarch

See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
---
 testng.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testng.spec b/testng.spec
index b313c9a..8152fea 100644
--- a/testng.spec
+++ b/testng.spec
@@ -20,6 +20,7 @@ Patch0:         0001-Avoid-accidental-javascript-in-javadoc.patch
 Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
 
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 BuildRequires:  maven-local
 %if %{with bootstrap}

From 3d85135bf77232468aa4decc3115f114381e5096 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 14 Jun 2022 08:03:17 +0200
Subject: [PATCH 05/39] Update build-requires in bootstrap mode

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

diff --git a/testng.spec b/testng.spec
index 8152fea..60d9f7b 100644
--- a/testng.spec
+++ b/testng.spec
@@ -22,10 +22,10 @@ Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  maven-local
 BuildRequires:  mvn(com.beust:jcommander)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(com.google.inject:guice::no_aop:)

From 7df447536aa5220187eb7b293f3ebda5f3df520b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 10:19:26 +0000
Subject: [PATCH 06/39] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 60d9f7b..da4e8cc 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -93,6 +93,9 @@ 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
 

From f9b06b06aa23a4ab9e47845a58b06349eb75c15f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 31 Aug 2022 08:36:51 +0200
Subject: [PATCH 07/39] Onboard package into gating

---
 .fmf/version           | 1 +
 ci.fmf                 | 1 +
 gating.yaml            | 8 ++++++++
 plans/javapackages.fmf | 7 +++++++
 4 files changed, 17 insertions(+)
 create mode 100644 .fmf/version
 create mode 100644 ci.fmf
 create mode 100644 gating.yaml
 create mode 100644 plans/javapackages.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..0d484d7
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
new file mode 100644
index 0000000..8f6c9cb
--- /dev/null
+++ b/plans/javapackages.fmf
@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://src.fedoraproject.org/tests/javapackages
+  ref: f37
+execute:
+  how: tmt

From 521d9a4cd950fc833a3e941b4ef583893fe413fa Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 26 Sep 2022 16:17:05 +0200
Subject: [PATCH 08/39] Update to upstream version 7.6.1

---
 .gitignore                                    |   2 +
 ...oid-accidental-javascript-in-javadoc.patch |   8 +-
 ...Replace-bundled-jquery-with-CDN-link.patch |  22 +-
 generate-tarball.sh                           |   1 +
 pom.xml                                       | 240 ------------------
 sources                                       |   3 +-
 testng.spec                                   |  28 +-
 7 files changed, 35 insertions(+), 269 deletions(-)
 delete mode 100644 pom.xml

diff --git a/.gitignore b/.gitignore
index d5fa4b3..f5c3b23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@
 /testng-7.2.0~SNAPSHOT.tar.gz
 /testng-7.3.0.tar.gz
 /testng-7.4.0.tar.gz
+/testng-7.6.1.tar.gz
+/testng-7.6.1.pom
diff --git a/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch
index fc97728..4e072e3 100644
--- a/0001-Avoid-accidental-javascript-in-javadoc.patch
+++ b/0001-Avoid-accidental-javascript-in-javadoc.patch
@@ -4,13 +4,13 @@ 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 | 4 +++-
+ testng-core/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
+diff --git a/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java b/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
 index b74572a..7c490e9 100644
---- a/src/main/java/org/testng/xml/TestNGContentHandler.java
-+++ b/src/main/java/org/testng/xml/TestNGContentHandler.java
+--- a/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
++++ b/testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java
 @@ -250,7 +250,9 @@ public class TestNGContentHandler extends DefaultHandler {
      }
    }
diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch
index d854bce..0223446 100644
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ b/0002-Replace-bundled-jquery-with-CDN-link.patch
@@ -4,32 +4,32 @@ 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 | 1 -
- src/main/resources/org/testng/header            | 2 +-
+ testng-core/src/main/java/org/testng/reporters/jq/Main.java | 1 -
+ testng-core/src/main/resources/org/testng/header            | 2 +-
  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
+diff --git a/testng-core/src/main/java/org/testng/reporters/jq/Main.java b/testng-core/src/main/java/org/testng/reporters/jq/Main.java
 index efd6799..2d8b74e 100644
---- a/src/main/java/org/testng/reporters/jq/Main.java
-+++ b/src/main/java/org/testng/reporters/jq/Main.java
+--- a/testng-core/src/main/java/org/testng/reporters/jq/Main.java
++++ b/testng-core/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-3.6.0.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
+diff --git a/testng-core/src/main/resources/org/testng/header b/testng-core/src/main/resources/org/testng/header
 index f5abbc3..817badc 100644
---- a/src/main/resources/org/testng/header
-+++ b/src/main/resources/org/testng/header
+--- a/testng-core/src/main/resources/org/testng/header
++++ b/testng-core/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.min.js"></script>
-+    <script type="text/javascript" src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+-    <script type="text/javascript" src="jquery-3.6.0.min.js"></script>
++    <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.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 9857a89..284a54c 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -16,6 +16,7 @@ tar -xf "../${name}-${upstream_version}.orig.tar.gz"
 # CLEAN TARBALL
 rm -r */bin*
 rm -r */gradle*
+find -name 'jquery-*.min.js' -delete
 
 tar -czf "../${name}-${version}.tar.gz" *
 popd
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 051ea60..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<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 -->
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.testng</groupId>
-  <artifactId>testng</artifactId>
-  <packaging>jar</packaging>
-  <name>TestNG</name>
-  <version>@VERSION@</version>
-  <description>TestNG is a testing framework.</description>
-  <url>http://testng.org</url>
-    
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://apache.org/licenses/LICENSE-2.0</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <connection>scm:git:git@github.com:cbeust/testng.git</connection>
-    <developerConnection>scm:git:git@github.com:cbeust/testng.git</developerConnection>
-    <url>git@github.com:cbeust/testng.git</url>
-  </scm>
-    
-  <developers>
-    <developer>
-      <name>Cedric Beust</name>
-    </developer>
-  </developers>
-
-  <distributionManagement>
-    <repository>
-      <id>bintray</id>
-      <url>https://api.bintray.com/maven/cbeust/maven/testng</url>
-    </repository>
-  </distributionManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.beust</groupId>
-      <artifactId>jcommander</artifactId>
-      <version>1.64</version>
-    </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>1.17</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.9.7</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache-extras.beanshell</groupId>
-      <artifactId>bsh</artifactId>
-      <version>2.0b6</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>4.1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.1</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-
-      <!-- Generating Javadoc -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.3</version>
-        <configuration>
-          <failOnError>false</failOnError>
-          <excludePackageNames>*internal</excludePackageNames>
-         </configuration>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-        </executions>
-      </plugin>
-
-      <!-- Bundle sources -->
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.1</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-            </execution>
-        </executions>
-      </plugin>
-
-      <!-- Compilation -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-
-      <!-- Resource handling -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.4.3</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- OSGi manifest creation -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.1.0</version>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-            <configuration>
-              <instructions>
-                <_versionpolicy>$(@)</_versionpolicy>
-                <Export-Package>com.beust.testng,org.testng*</Export-Package>
-                <Import-Package>
-                  com.beust.jcommander.*;version="[1.7.0,3.0.0)",
-                  bsh.*;version="[2.0.0,3.0.0)";resolution:=optional,
-                  com.google.inject.*;version="[1.2,1.3)";resolution:=optional,
-                  junit.framework;version="[3.8.1, 5.0.0)";resolution:=optional,
-                  org.junit.*;resolution:=optional,
-                  org.apache.tools.ant.*;version="[1.7.0, 2.0.0)";resolution:=optional,
-                  org.yaml.*;version="[1.6,2.0)";resolution:=optional,
-                  !com.beust.testng,
-                  !org.testng.*,
-                  !com.sun.*,
-                  *
-                </Import-Package>
-              </instructions>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Add OSGi manifest in JAR -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <!-- Tests -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19</version>
-        <configuration>
-          <suiteXmlFiles>
-            <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
-          </suiteXmlFiles>
-          <properties>
-            <property>
-              <name>listener</name>
-              <value>test.invokedmethodlistener.MyListener</value>
-            </property>
-          </properties>
-          <systemPropertyVariables>
-            <test.resources.dir>${project.build.testOutputDirectory}</test.resources.dir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
-      <!-- Signing with gpg -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-
-  </build>
-</project>
diff --git a/sources b/sources
index ec3490d..8a292a1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (testng-7.4.0.tar.gz) = 7cb2c47e4169c56f7b65c8213af1b88b516d4f6d84a5e3046c83a543c5124689cc95197cb291856c408784a78a8b7d1aae1fb5c426bd7e61c42504e5f92d65db
+SHA512 (testng-7.6.1.tar.gz) = ac68ac36ef880aa6c07d50d371a0d2c1281500d78329e5397fa63e62fee097cef4763efa855c536a09dbf46e4753a65823930e5f5ed54c6171b37318c346ae66
+SHA512 (testng-7.6.1.pom) = f47d9365cc005798c8d748d66d34dd73b11d484e36d555623b0676729b47069aae2dad829deffa8b44b870d3fa5296fa44258edcede1a8062582cecc2926e5a1
diff --git a/testng.spec b/testng.spec
index da4e8cc..fe71618 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,8 +1,8 @@
 %bcond_with bootstrap
 
 Name:           testng
-Version:        7.4.0
-Release:        4%{?dist}
+Version:        7.6.1
+Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -11,7 +11,7 @@ URL:            http://testng.org/
 Source0:        %{name}-%{version}.tar.gz
 
 # Allows building with maven instead of gradle
-Source1:        pom.xml
+Source1:        https://repo1.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
 
 # Remove bundled binaries to make sure we don't ship anything forbidden
 Source2:        generate-tarball.sh
@@ -49,30 +49,28 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%(echo %{version} | tr '~' '-')
 
+cp %{SOURCE1} pom.xml
+
 %patch0 -p1
 %patch1 -p1
 
-sed 's/@VERSION@/%{version}/' %{SOURCE1} > pom.xml
+# Contains differently licensed sources
+rm -rf testng-test-osgi
+
+find . -mindepth 2 -name src -type d -exec cp -r -t . {} +
 
 # remove any bundled libs, but not test resources
 find ! -path "*/test/*" -name *.jar -print -delete
 find -name *.class -delete
 
-# these are unnecessary
-%pom_remove_plugin :maven-gpg-plugin
-%pom_remove_plugin :maven-source-plugin
-%pom_remove_plugin :maven-javadoc-plugin
+%pom_remove_dep org.webjars:jquery
 
 %pom_remove_dep org.yaml:snakeyaml
 rm src/main/java/org/testng/internal/Yaml*.java
 rm src/main/java/org/testng/Converter.java
 
-%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
-
 cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 
 %mvn_file : %{name}
@@ -80,7 +78,8 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %mvn_alias : :::jdk15:
 
 %build
-%mvn_build -f
+# Tests extend a class written in Kotlin
+%mvn_build -f -- -Dmaven.compiler.source=8 -Dmaven.compiler.target=8
 
 %install
 %mvn_install
@@ -93,6 +92,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 7.6.1-1
+- Update to upstream version 7.6.1
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From c325abc1695dd676b402cdead1996278c95a8262 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 04:53:55 +0000
Subject: [PATCH 09/39] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index fe71618..6ea4f57 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.6.1
-Release:        1%{?dist}
+Release:        2%{?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
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 7.6.1-1
 - Update to upstream version 7.6.1
 

From 748996bc64e78ddbd501cc0c1606559a4b0838af Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 21 Mar 2023 09:26:39 +0100
Subject: [PATCH 10/39] Port to Google Guice 5

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

diff --git a/testng.spec b/testng.spec
index 6ea4f57..f73dca5 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -28,7 +28,7 @@ BuildRequires:  javapackages-bootstrap
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.beust:jcommander)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(com.google.inject:guice::no_aop:)
+BuildRequires:  mvn(com.google.inject:guice)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
@@ -69,8 +69,6 @@ find -name *.class -delete
 rm src/main/java/org/testng/internal/Yaml*.java
 rm src/main/java/org/testng/Converter.java
 
-%pom_xpath_inject "pom:dependency[pom:artifactId='guice']" "<classifier>no_aop</classifier>"
-
 cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 
 %mvn_file : %{name}
@@ -92,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-3
+- Port to Google Guice 5
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From cd95c6a77723cfa501c42dda9abecf297d3836c4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 31 Mar 2023 18:00:20 +0200
Subject: [PATCH 11/39] Bootstrap build

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

diff --git a/testng.spec b/testng.spec
index f73dca5..85ad603 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,4 +1,4 @@
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 Name:           testng
 Version:        7.6.1

From d4274b15c287195f430737fc2018d71659d8493d Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 31 Mar 2023 18:02:57 +0200
Subject: [PATCH 12/39] Non-bootstrap build

This reverts commit cd95c6a77723cfa501c42dda9abecf297d3836c4.
---
 testng.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 85ad603..f73dca5 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 Name:           testng
 Version:        7.6.1

From 626c55575953b99f61d55ee47c028034f3f09456 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 31 Mar 2023 20:12:16 +0200
Subject: [PATCH 13/39] Rebuild with no changes

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

diff --git a/testng.spec b/testng.spec
index f73dca5..3e87e36 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-4
+- Rebuild with no changes
+
 * Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-3
 - Port to Google Guice 5
 

From 69e418d136fa4fd1a002122efb64ce27adb24a07 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 03:29:11 +0000
Subject: [PATCH 14/39] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 3e87e36..dce6d97 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java-based testing framework
 License:        ASL 2.0
 URL:            http://testng.org/
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-4
 - Rebuild with no changes
 

From 87fb4857feabedf5ec6fc9d537b7085325f0dfe6 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 17 Jul 2023 13:36:31 +0200
Subject: [PATCH 15/39] Update license to SPDX format

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

diff --git a/testng.spec b/testng.spec
index dce6d97..447d67a 100644
--- a/testng.spec
+++ b/testng.spec
@@ -4,7 +4,7 @@ Name:           testng
 Version:        7.6.1
 Release:        5%{?dist}
 Summary:        Java-based testing framework
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            http://testng.org/
 
 # ./generate-tarball.sh

From 14e335421d1ffc0ea4d5264183a9b4acbfb1d0d6 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Mon, 17 Jul 2023 13:35:20 +0200
Subject: [PATCH 16/39] Update to upstream version 7.8.0

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 testng.spec | 23 +++++++++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5c3b23..32d5682 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@
 /testng-7.4.0.tar.gz
 /testng-7.6.1.tar.gz
 /testng-7.6.1.pom
+/testng-7.8.0.tar.gz
+/testng-7.8.0.pom
diff --git a/sources b/sources
index 8a292a1..1d90842 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (testng-7.6.1.tar.gz) = ac68ac36ef880aa6c07d50d371a0d2c1281500d78329e5397fa63e62fee097cef4763efa855c536a09dbf46e4753a65823930e5f5ed54c6171b37318c346ae66
-SHA512 (testng-7.6.1.pom) = f47d9365cc005798c8d748d66d34dd73b11d484e36d555623b0676729b47069aae2dad829deffa8b44b870d3fa5296fa44258edcede1a8062582cecc2926e5a1
+SHA512 (testng-7.8.0.tar.gz) = 845fd50bc94e0dac560a6dacd7fcf1cdc1dba870fd73c7fe89342460325c02f02e13a407d4dacf1328723b3c9fefa778b67f2e27208858c629e391cb1e3b4333
+SHA512 (testng-7.8.0.pom) = 1f203073eea51a187824e7096a9eb0fd5df7b76ebfe65fa49037b28826dda216f75e73ed352ce4af645389cbbd2d72ccbf2a1fe9ccafe0d5daddcab4ed6d3959
diff --git a/testng.spec b/testng.spec
index 447d67a..99439e0 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,11 +1,11 @@
 %bcond_with bootstrap
 
 Name:           testng
-Version:        7.6.1
-Release:        5%{?dist}
+Version:        7.8.0
+Release:        1%{?dist}
 Summary:        Java-based testing framework
 License:        Apache-2.0
-URL:            http://testng.org/
+URL:            https://testng.org/doc/
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
@@ -51,17 +51,17 @@ This package contains the API documentation for %{name}.
 
 cp %{SOURCE1} pom.xml
 
-%patch0 -p1
-%patch1 -p1
+%patch 0 -p1
+%patch 1 -p1
 
 # Contains differently licensed sources
-rm -rf testng-test-osgi
+rm -r testng-test-osgi
 
-find . -mindepth 2 -name src -type d -exec cp -r -t . {} +
+find . -mindepth 2 -name 'src' -type d -exec cp -r -t . {} +
 
 # remove any bundled libs, but not test resources
-find ! -path "*/test/*" -name *.jar -print -delete
-find -name *.class -delete
+find ! -path '*/test/*' -name '*.jar' -print -delete
+find -name '*.class' -delete
 
 %pom_remove_dep org.webjars:jquery
 
@@ -77,7 +77,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 
 %build
 # Tests extend a class written in Kotlin
-%mvn_build -f -- -Dmaven.compiler.source=8 -Dmaven.compiler.target=8
+%mvn_build -f -- -Dmaven.compiler.release=11
 
 %install
 %mvn_install
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 7.8.0-1
+- Update to upstream version 7.8.0
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 83fb98bed077c48fb21eb5c7da41d9ca1a741c23 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 17 Aug 2023 15:58:53 +0200
Subject: [PATCH 17/39] Bootstrap build

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

diff --git a/testng.spec b/testng.spec
index 99439e0..4c147ba 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,4 +1,4 @@
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 Name:           testng
 Version:        7.8.0

From 24d4d6991537b03a320a5fd76a5c8b4c074cf376 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 17 Aug 2023 16:22:35 +0200
Subject: [PATCH 18/39] Non-bootstrap build

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

diff --git a/testng.spec b/testng.spec
index 4c147ba..99439e0 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,4 +1,4 @@
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 Name:           testng
 Version:        7.8.0

From b166b09ef3f715b46131aaf8126815a07b2b07c1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 1 Sep 2023 15:58:22 +0200
Subject: [PATCH 19/39] Rebuild

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

diff --git a/testng.spec b/testng.spec
index 99439e0..d9e1c20 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java-based testing framework
 License:        Apache-2.0
 URL:            https://testng.org/doc/
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.8.0-2
+- Rebuild
+
 * Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 7.8.0-1
 - Update to upstream version 7.8.0
 

From 5f32db5b2e6d31ec2c4cc38fe7ae877064172a34 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 26 Oct 2023 07:33:08 +0200
Subject: [PATCH 20/39] Update javapackages test plan to f40

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 8f6c9cb..a2cdaba 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
-  ref: f37
+  ref: f40
 execute:
   how: tmt

From 7dac6ea99c7a9e5a514aa2aa7f003316943871a5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 05:54:10 +0000
Subject: [PATCH 21/39] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

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

diff --git a/testng.spec b/testng.spec
index d9e1c20..eff3112 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java-based testing framework
 License:        Apache-2.0
 URL:            https://testng.org/doc/
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.8.0-2
 - Rebuild
 

From 967708a7a3ac908ad39f0f1eb5b57a00ee80313f Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 23 Feb 2024 14:41:57 +0100
Subject: [PATCH 22/39] bump of release for for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
We are sorry, we messed a bit, and we have to bump release in this package
---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index eff3112..2093866 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java-based testing framework
 License:        Apache-2.0
 URL:            https://testng.org/doc/
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-4
+- bump of release for for java-21-openjdk as system jdk
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 8282d86f3b3fc27f50a1fbb5ae405ebfc73f09b8 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Feb 2024 18:20:03 +0100
Subject: [PATCH 23/39] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
---
 testng.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testng.spec b/testng.spec
index 2093866..81872e5 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.8.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java-based testing framework
 License:        Apache-2.0
 URL:            https://testng.org/doc/
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-5
+- Rebuilt for java-21-openjdk as system jdk
+
 * Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-4
 - bump of release for for java-21-openjdk as system jdk
 

From bf8c986e8e8a5ce8383bc1fc28fecd3da8ec2fe1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 07:18:38 +0000
Subject: [PATCH 24/39] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

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

diff --git a/testng.spec b/testng.spec
index 81872e5..ec66902 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.8.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java-based testing framework
 License:        Apache-2.0
 URL:            https://testng.org/doc/
@@ -90,6 +90,9 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-5
 - Rebuilt for java-21-openjdk as system jdk
 

From 48e4d23eef983bc6104e6494f8e483f6c4abb8d5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 31 Jul 2024 20:53:30 +0200
Subject: [PATCH 25/39] Switch javapackages tests to f41 branch

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index a2cdaba..17c6113 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
-  ref: f40
+  ref: f41
 execute:
   how: tmt

From aa4e86a1aecb322373e740ef6ca7e189d8d25386 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Aug 2024 16:33:57 +0200
Subject: [PATCH 26/39] Switch from %setup to %autosetup

---
 testng.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/testng.spec b/testng.spec
index ec66902..50a9ecc 100644
--- a/testng.spec
+++ b/testng.spec
@@ -47,12 +47,10 @@ Summary:        API documentation for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%(echo %{version} | tr '~' '-')
+%autosetup -p1 -C
 
 cp %{SOURCE1} pom.xml
 
-%patch 0 -p1
-%patch 1 -p1
 
 # Contains differently licensed sources
 rm -r testng-test-osgi

From 7cf83d3e04a8885cdd77e9d097c93809a040cb00 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 Aug 2024 22:13:19 +0200
Subject: [PATCH 27/39] Switch to non-numdered patches

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

diff --git a/testng.spec b/testng.spec
index 50a9ecc..869c2d3 100644
--- a/testng.spec
+++ b/testng.spec
@@ -16,8 +16,8 @@ Source1:        https://repo1.maven.org/maven2/org/testng/testng/%{version}/test
 # Remove bundled binaries to make sure we don't ship anything forbidden
 Source2:        generate-tarball.sh
 
-Patch0:         0001-Avoid-accidental-javascript-in-javadoc.patch
-Patch1:         0002-Replace-bundled-jquery-with-CDN-link.patch
+Patch:          0001-Avoid-accidental-javascript-in-javadoc.patch
+Patch:          0002-Replace-bundled-jquery-with-CDN-link.patch
 
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch

From 2f17814a14704849a385069899818346163297a0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 23 Aug 2024 00:45:19 +0200
Subject: [PATCH 28/39] Convert to %autorelease and %autochangelog

---
 changelog   | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++
 testng.spec | 249 +---------------------------------------------------
 2 files changed, 248 insertions(+), 247 deletions(-)
 create mode 100644 changelog

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..24dbf34
--- /dev/null
+++ b/changelog
@@ -0,0 +1,246 @@
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.8.0-2
+- Rebuild
+
+* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 7.8.0-1
+- Update to upstream version 7.8.0
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-4
+- Rebuild with no changes
+
+* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-3
+- Port to Google Guice 5
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 7.6.1-1
+- Update to upstream version 7.6.1
+
+* 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
+
+* 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
+
+* 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
+
+* Tue Jul 17 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.14.3-4
+- Allow conditionally building without snakeyaml
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Mar 20 2018 Alexander Kurtakov <akurtako@redhat.com> 6.14.3-2
+- Bump maven pom version.
+
+* Tue Mar 20 2018 Alexander Kurtakov <akurtako@redhat.com> 6.14.3-1
+- Update to upstream 6.14.3.
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 23 2017 Mat Booth <mat.booth@redhat.com> - 6.12-2
+- Allow OSGi metadata to export all packages including internal ones
+
+* Fri Jul 28 2017 Mat Booth <mat.booth@redhat.com> - 6.12-1
+- Update to latest release of testng
+- Fixes classloading from ant rhbz#1475842
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jul 04 2017 Mat Booth <mat.booth@redhat.com> - 6.11-1
+- Update to latest upstream release
+- Continue building with maven for now, instead of moving to gradle due to
+  rhbz#1467724
+
+* Wed May 31 2017 Michael Simacek <msimacek@redhat.com> - 6.9.12-5
+- Avoid accidental javascript in comment
+
+* Fri Feb 17 2017 Mat Booth <mat.booth@redhat.com> - 6.9.12-4
+- License correction
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb  1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.9.12-2
+- Introduce build-conditional to allow building without groovy
+
+* Tue Nov 01 2016 Mat Booth <mat.booth@redhat.com> - 6.9.12-1
+- Update to upstream version 6.9.12
+- Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package
+
+* Wed Apr 20 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.9.11-1
+- Update to upstream version 6.9.11
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jan 08 2016 gil cattaneo <puntogil@libero.it> 6.9.10-1
+- Update to 6.9.10
+
+* Tue Oct 27 2015 gil cattaneo <puntogil@libero.it> 6.9.9-1
+- Update to 6.9.9
+
+* Tue Oct 13 2015 gil cattaneo <puntogil@libero.it> 6.9.8-1
+- Update to 6.9.8
+
+* Mon Sep 07 2015 Mat Booth <mat.booth@redhat.com> - 6.9.5-1
+- Update to 6.9.5
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.21-1
+- Update to 6.8.21
+- introduce license macro
+
+* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.17-1
+- Update to 6.8.17
+
+* Wed Jan 14 2015 gil cattaneo <puntogil@libero.it> 6.8.14-1
+- Update to 6.8.14
+
+* Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-3
+- Fix build-requires on sonatype-oss-parent
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-1
+- Update to upstream version 6.8.8
+
+* Thu Sep 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.8.7-1
+- Update to upstream version 6.8.7
+- Provide additional jdk15 classifier
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.5-1
+- Update to upstream version 6.8.5
+
+* Sun Feb 10 2013 Mat Booth <fedora@matbooth.co.uk> - 6.8-1
+- Update to latest upstream release, rhbz #888233
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 6.0.1-6
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.0.1-5
+- Part of testng is CPL, add it to license tag
+
+* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.0.1-4
+- Spec file cleanups and add_maven_depmap macro use
+- Drop no longer needed depmap
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu May 12 2011 Jaromir Capik <jcapik@redhat.com> - 6.0.1-1
+- Update to 6.0.1
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jul 19 2010 Lubomir Rintel <lkundrak@v3.sk> - 5.11-3
+- Drop backport util concurrent dependency, we don't build jdk14 jar
+
+* Mon Dec 21 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-2
+- Add POM
+
+* Sun Dec 20 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-1
+- Bump to 5.11
+- Add maven depmap fragments
+- Fix line encoding of README
+
+* Wed Dec 09 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-2
+- Add javadoc
+- Don't ship jdk14 jar
+
+* Fri Nov 27 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-1
+- Initial packaging
diff --git a/testng.spec b/testng.spec
index 869c2d3..0ca5e1d 100644
--- a/testng.spec
+++ b/testng.spec
@@ -2,7 +2,7 @@
 
 Name:           testng
 Version:        7.8.0
-Release:        6%{?dist}
+Release:        %autorelease
 Summary:        Java-based testing framework
 License:        Apache-2.0
 URL:            https://testng.org/doc/
@@ -88,249 +88,4 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %license LICENSE.txt
 
 %changelog
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-5
-- Rebuilt for java-21-openjdk as system jdk
-
-* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 7.8.0-4
-- bump of release for for java-21-openjdk as system jdk
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.8.0-2
-- Rebuild
-
-* Thu Aug 17 2023 Marian Koncek <mkoncek@redhat.com> - 7.8.0-1
-- Update to upstream version 7.8.0
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Mar 31 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-4
-- Rebuild with no changes
-
-* Tue Mar 21 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.6.1-3
-- Port to Google Guice 5
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.6.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Sep 09 2022 Marian Koncek <mkoncek@redhat.com> - 7.6.1-1
-- Update to upstream version 7.6.1
-
-* 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
-
-* 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
-
-* 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
-
-* Tue Jul 17 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.14.3-4
-- Allow conditionally building without snakeyaml
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.14.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Mar 20 2018 Alexander Kurtakov <akurtako@redhat.com> 6.14.3-2
-- Bump maven pom version.
-
-* Tue Mar 20 2018 Alexander Kurtakov <akurtako@redhat.com> 6.14.3-1
-- Update to upstream 6.14.3.
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 23 2017 Mat Booth <mat.booth@redhat.com> - 6.12-2
-- Allow OSGi metadata to export all packages including internal ones
-
-* Fri Jul 28 2017 Mat Booth <mat.booth@redhat.com> - 6.12-1
-- Update to latest release of testng
-- Fixes classloading from ant rhbz#1475842
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jul 04 2017 Mat Booth <mat.booth@redhat.com> - 6.11-1
-- Update to latest upstream release
-- Continue building with maven for now, instead of moving to gradle due to
-  rhbz#1467724
-
-* Wed May 31 2017 Michael Simacek <msimacek@redhat.com> - 6.9.12-5
-- Avoid accidental javascript in comment
-
-* Fri Feb 17 2017 Mat Booth <mat.booth@redhat.com> - 6.9.12-4
-- License correction
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb  1 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.9.12-2
-- Introduce build-conditional to allow building without groovy
-
-* Tue Nov 01 2016 Mat Booth <mat.booth@redhat.com> - 6.9.12-1
-- Update to upstream version 6.9.12
-- Avoid 'SNAPSHOT' in pom version to fix tests in testng-remote package
-
-* Wed Apr 20 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.9.11-1
-- Update to upstream version 6.9.11
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jan 08 2016 gil cattaneo <puntogil@libero.it> 6.9.10-1
-- Update to 6.9.10
-
-* Tue Oct 27 2015 gil cattaneo <puntogil@libero.it> 6.9.9-1
-- Update to 6.9.9
-
-* Tue Oct 13 2015 gil cattaneo <puntogil@libero.it> 6.9.8-1
-- Update to 6.9.8
-
-* Mon Sep 07 2015 Mat Booth <mat.booth@redhat.com> - 6.9.5-1
-- Update to 6.9.5
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.21-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.21-1
-- Update to 6.8.21
-- introduce license macro
-
-* Tue Jan 20 2015 gil cattaneo <puntogil@libero.it> 6.8.17-1
-- Update to 6.8.17
-
-* Wed Jan 14 2015 gil cattaneo <puntogil@libero.it> 6.8.14-1
-- Update to 6.8.14
-
-* Mon Aug  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-3
-- Fix build-requires on sonatype-oss-parent
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed Feb 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.8-1
-- Update to upstream version 6.8.8
-
-* Thu Sep 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.8.7-1
-- Update to upstream version 6.8.7
-- Provide additional jdk15 classifier
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.8.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue May 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.8.5-1
-- Update to upstream version 6.8.5
-
-* Sun Feb 10 2013 Mat Booth <fedora@matbooth.co.uk> - 6.8-1
-- Update to latest upstream release, rhbz #888233
-
-* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 6.0.1-6
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Thu Nov 08 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.0.1-5
-- Part of testng is CPL, add it to license tag
-
-* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 6.0.1-4
-- Spec file cleanups and add_maven_depmap macro use
-- Drop no longer needed depmap
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu May 12 2011 Jaromir Capik <jcapik@redhat.com> - 6.0.1-1
-- Update to 6.0.1
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.11-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Jul 19 2010 Lubomir Rintel <lkundrak@v3.sk> - 5.11-3
-- Drop backport util concurrent dependency, we don't build jdk14 jar
-
-* Mon Dec 21 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-2
-- Add POM
-
-* Sun Dec 20 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.11-1
-- Bump to 5.11
-- Add maven depmap fragments
-- Fix line encoding of README
-
-* Wed Dec 09 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-2
-- Add javadoc
-- Don't ship jdk14 jar
-
-* Fri Nov 27 2009 Lubomir Rintel <lkundrak@v3.sk> - 5.10-1
-- Initial packaging
+%autochangelog

From 808211b59f45d7dbbce5e2f4b75582fbdc6bd34e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 29 Nov 2024 08:28:39 +0100
Subject: [PATCH 29/39] Update javapackages test plan to f42

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 17c6113..86bfcea 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
-  ref: f41
+  ref: f42
 execute:
   how: tmt

From c318afa9c8bc02e63aa8a0da817038f9c8626ce8 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 Dec 2024 16:01:19 +0100
Subject: [PATCH 30/39] Unify spec style with the rest of Java/Maven packages
 [skip changelog]

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

diff --git a/testng.spec b/testng.spec
index 0ca5e1d..28531f4 100644
--- a/testng.spec
+++ b/testng.spec
@@ -9,16 +9,13 @@ URL:            https://testng.org/doc/
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
-
 # Allows building with maven instead of gradle
 Source1:        https://repo1.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom
-
 # Remove bundled binaries to make sure we don't ship anything forbidden
 Source2:        generate-tarball.sh
 
 Patch:          0001-Avoid-accidental-javascript-in-javadoc.patch
 Patch:          0002-Replace-bundled-jquery-with-CDN-link.patch
-
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 

From b4c3243639a87ea62332833a7df367d8ceb18f5f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 30 Dec 2024 16:40:57 +0100
Subject: [PATCH 31/39] Reorder spec file tags [skip changelog]

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

diff --git a/testng.spec b/testng.spec
index 28531f4..494e963 100644
--- a/testng.spec
+++ b/testng.spec
@@ -6,6 +6,8 @@ Release:        %autorelease
 Summary:        Java-based testing framework
 License:        Apache-2.0
 URL:            https://testng.org/doc/
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
@@ -16,8 +18,6 @@ Source2:        generate-tarball.sh
 
 Patch:          0001-Avoid-accidental-javascript-in-javadoc.patch
 Patch:          0002-Replace-bundled-jquery-with-CDN-link.patch
-BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap

From eb749712ea967da0e36f7669c8921ce7bf5ca990 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 31 Dec 2024 09:59:11 +0100
Subject: [PATCH 32/39] Update javadoc package description [skip changelog]

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

diff --git a/testng.spec b/testng.spec
index 494e963..cee1b41 100644
--- a/testng.spec
+++ b/testng.spec
@@ -41,7 +41,7 @@ functional, end-to-end, integration, etc.
 Summary:        API documentation for %{name}
 
 %description javadoc
-This package contains the API documentation for %{name}.
+API documentation for %{name}.
 
 %prep
 %autosetup -p1 -C

From 02bd2106401b092c6a3d3e4b873615a97442420c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 12:38:57 +0000
Subject: [PATCH 33/39] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 40de6aa7f320a09753134053c0dd867f7ac9a570 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Mon, 3 Mar 2025 11:57:14 +0100
Subject: [PATCH 34/39] Remove javadoc subpackage

---
 testng.spec | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/testng.spec b/testng.spec
index cee1b41..922f954 100644
--- a/testng.spec
+++ b/testng.spec
@@ -30,6 +30,8 @@ BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.ant:ant)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 %endif
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 7.8.0-20
 
 %description
 TestNG is a testing framework inspired from JUnit and NUnit but introducing
@@ -37,12 +39,6 @@ some new functionality, including flexible test configuration, and
 distributed test running.  It is designed to cover unit tests as well as
 functional, end-to-end, integration, etc.
 
-%package javadoc
-Summary:        API documentation for %{name}
-
-%description javadoc
-API documentation for %{name}.
-
 %prep
 %autosetup -p1 -C
 
@@ -72,7 +68,7 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 
 %build
 # Tests extend a class written in Kotlin
-%mvn_build -f -- -Dmaven.compiler.release=11
+%mvn_build -j -f -- -Dmaven.compiler.release=11
 
 %install
 %mvn_install
@@ -81,8 +77,5 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %doc CHANGES.txt README.md
 %license LICENSE.txt
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt
-
 %changelog
 %autochangelog

From e12be2f374497ac816ea945d2a67d26b654ec8ce Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 26 Mar 2025 08:43:19 +0100
Subject: [PATCH 35/39] Switch to javapackages tests from CentOS Stream GitLab

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 86bfcea..e39d47c 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
   ref: f42
 execute:
   how: tmt

From 1ae91a77b999b2d71e6afe13d9f76e6217d91a5e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 22 May 2025 13:35:32 +0200
Subject: [PATCH 36/39] Switch javapackages test plan to f43 ref

---
 plans/javapackages.fmf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index e39d47c..ae17c0c 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -2,6 +2,6 @@ summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f42
+  ref: f43
 execute:
   how: tmt

From 3fc566ac891cd6e25d61fcdaba79a75f0c3f38f5 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sun, 13 Jul 2025 09:22:52 +0200
Subject: [PATCH 37/39] Build with OpenJDK 25

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

diff --git a/testng.spec b/testng.spec
index 922f954..6173a52 100644
--- a/testng.spec
+++ b/testng.spec
@@ -22,7 +22,7 @@ Patch:          0002-Replace-bundled-jquery-with-CDN-link.patch
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(com.beust:jcommander)
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(com.google.inject:guice)

From 1fdd38ec1d2c063aa7694a3ff8a9ca28072d1244 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 19:13:09 +0000
Subject: [PATCH 38/39] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From ec0b345eaf52ebf96ff510a6958e1bf7637cb949 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 30 Jul 2025 01:22:25 +0200
Subject: [PATCH 39/39] Rebuilt for java-25-openjdk as preffered jdk

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.