diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/.gitignore b/.gitignore
index 32d5682..5eb362b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,16 +17,3 @@
 /6.9.12.tar.gz
 /6.11.tar.gz
 /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
-/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/0001-Avoid-accidental-javascript-in-javadoc.patch b/0001-Avoid-accidental-javascript-in-javadoc.patch
index 4e072e3..8016b86 100644
--- a/0001-Avoid-accidental-javascript-in-javadoc.patch
+++ b/0001-Avoid-accidental-javascript-in-javadoc.patch
@@ -1,27 +1,25 @@
-From bce3019741aeb785658b23095ae408a6c2d8ca35 Mon Sep 17 00:00:00 2001
+From 214bd64764a48c5c3ad68829e0e35377f45ce221 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Wed, 31 May 2017 13:44:36 +0200
-Subject: [PATCH 1/2] Avoid accidental javascript in javadoc
+Subject: [PATCH] Avoid accidental javascript in javadoc
 
 ---
- testng-core/src/main/java/org/testng/xml/TestNGContentHandler.java | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ src/main/java/org/testng/xml/TestNGContentHandler.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-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/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/src/main/java/org/testng/xml/TestNGContentHandler.java b/src/main/java/org/testng/xml/TestNGContentHandler.java
+index e36c413..da9a069 100755
+--- a/src/main/java/org/testng/xml/TestNGContentHandler.java
++++ b/src/main/java/org/testng/xml/TestNGContentHandler.java
+@@ -240,7 +240,7 @@ 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.20.1
+2.9.4
 
diff --git a/0002-Replace-bundled-jquery-with-CDN-link.patch b/0002-Replace-bundled-jquery-with-CDN-link.patch
deleted file mode 100644
index 0223446..0000000
--- a/0002-Replace-bundled-jquery-with-CDN-link.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9155677e2d5acdd2379c38041189da52c7f04946 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Wed, 18 Jul 2018 15:57:49 +0200
-Subject: [PATCH 2/2] Replace bundled jquery with CDN link
-
----
- 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/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/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-3.6.0.min.js",
-         "testng-reports.css",
-         "testng-reports.js",
-         "testng-reports1.css",
-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/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-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'>
--- 
-2.31.1
-
diff --git a/changelog b/changelog
deleted file mode 100644
index 24dbf34..0000000
--- a/changelog
+++ /dev/null
@@ -1,246 +0,0 @@
-* 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/ci.fmf b/ci.fmf
deleted file mode 100644
index c5aa0e0..0000000
--- a/ci.fmf
+++ /dev/null
@@ -1 +0,0 @@
-resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index 0d484d7..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
---- !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/generate-tarball.sh b/generate-tarball.sh
deleted file mode 100755
index 284a54c..0000000
--- a/generate-tarball.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-name=testng
-version="$(sed -n 's/Version:\s*//p' *.spec)"
-upstream_version="$(echo ${version} | tr '~' '-')"
-
-# RETRIEVE
-wget "https://github.com/cbeust/testng/archive/${upstream_version}.tar.gz" -O "${name}-${upstream_version}.orig.tar.gz"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-pushd tarball-tmp
-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
-rm -r tarball-tmp "${name}-${upstream_version}.orig.tar.gz"
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
deleted file mode 100644
index ae17c0c..0000000
--- a/plans/javapackages.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Run javapackages-specific tests
-discover:
-  how: fmf
-  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
-  ref: f43
-execute:
-  how: tmt
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..3646242
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,247 @@
+
+<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>6.12</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>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>3</version>
+  </parent>
+
+  <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.7</source>
+          <target>1.7</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 1d90842..09eb7a0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (testng-7.8.0.tar.gz) = 845fd50bc94e0dac560a6dacd7fcf1cdc1dba870fd73c7fe89342460325c02f02e13a407d4dacf1328723b3c9fefa778b67f2e27208858c629e391cb1e3b4333
-SHA512 (testng-7.8.0.pom) = 1f203073eea51a187824e7096a9eb0fd5df7b76ebfe65fa49037b28826dda216f75e73ed352ce4af645389cbbd2d72ccbf2a1fe9ccafe0d5daddcab4ed6d3959
+SHA512 (6.12.tar.gz) = cfbeadef0f21c27060bf5a8b49182562bb3dbfb6c471bef73b9d1b799ea64da69f40dd1c8559436d2884b09892ef483fd98bdf896aa3b528b55d3ada347d329c
diff --git a/testng.spec b/testng.spec
index 6173a52..840c43e 100644
--- a/testng.spec
+++ b/testng.spec
@@ -1,37 +1,36 @@
-%bcond_with bootstrap
+%bcond_without groovy
 
 Name:           testng
-Version:        7.8.0
-Release:        %autorelease
+Version:        6.12
+Release:        2%{?dist}
 Summary:        Java-based testing framework
-License:        Apache-2.0
-URL:            https://testng.org/doc/
-BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
+License:        ASL 2.0
+URL:            http://testng.org/
+Source0:        https://github.com/cbeust/testng/archive/%{version}.tar.gz
 
-# ./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
+Source1:        pom.xml
 
-Patch:          0001-Avoid-accidental-javascript-in-javadoc.patch
-Patch:          0002-Replace-bundled-jquery-with-CDN-link.patch
+Patch0:         0001-Avoid-accidental-javascript-in-javadoc.patch
 
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  maven-local-openjdk25
+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.code.findbugs:jsr305)
 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:)
+BuildRequires:  mvn(org.yaml:snakeyaml)
+%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
-# 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
@@ -39,26 +38,41 @@ 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
+This package contains the API documentation for %{name}.
+
 %prep
-%autosetup -p1 -C
+%setup -q -n %{name}-%{version}
 
-cp %{SOURCE1} pom.xml
+%patch0 -p1
 
-
-# Contains differently licensed sources
-rm -r testng-test-osgi
-
-find . -mindepth 2 -name 'src' -type d -exec cp -r -t . {} +
+cp %{SOURCE1} .
 
 # 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
+# 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.yaml:snakeyaml
-rm src/main/java/org/testng/internal/Yaml*.java
-rm src/main/java/org/testng/Converter.java
+# 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
 
 cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 
@@ -67,8 +81,11 @@ cp -p ./src/main/java/*.dtd.html ./src/main/resources/.
 %mvn_alias : :::jdk15:
 
 %build
-# Tests extend a class written in Kotlin
-%mvn_build -j -f -- -Dmaven.compiler.release=11
+%if %{with groovy}
+%mvn_build -- -Dmaven.local.debug=true
+%else
+%mvn_build -f -- -Dmaven.local.debug=true
+%endif
 
 %install
 %mvn_install
@@ -77,5 +94,131 @@ 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
+* 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