Merge ~vpa1977/+git/testng7:main into ~vpa1977/+git/testng7:6.9.12-4

[Vladimir Petko]

Please do not merge, this is a new package testng7 that is a requirement for a number of OpenJDK 20 tests to pass.
A new package is made in order to avoid:
 - breaking API changes[2].

PPA: ppa:vpa1977/openjdk-20-testng75 [1]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/openjdk-20-testng75
[2] https://abi-laboratory.pro/index.php?view=timeline&lang=java&l=testng

f71412e... by Vladimir Petko on 2023-03-28

jquery is not used in 7.5, remove

f90f5d7... by Vladimir Petko on 2023-03-28

remove sources excluded by repack

a612f7e... by Vladimir Petko on 2023-03-28

update exclusion and copyright link

ab9ae44... by Vladimir Petko on 2023-03-28

add override for test jar files

07db379... by Vladimir Petko on 2023-03-28

update override comment

7f97dde... by Vladimir Petko on 2023-03-28

drop historical whitespaces

fc81289... by Vladimir Petko on 2023-03-28

add rules require root tag

eb3f126... by Vladimir Petko on 2023-03-28

add more overrides

8575236... by Vladimir Petko on 2023-03-28

remove old pom control file

Unmerged commits

8575236... by Vladimir Petko on 2023-03-28

remove old pom control file

eb3f126... by Vladimir Petko on 2023-03-28

add more overrides

fc81289... by Vladimir Petko on 2023-03-28

add rules require root tag

7f97dde... by Vladimir Petko on 2023-03-28

drop historical whitespaces

07db379... by Vladimir Petko on 2023-03-28

update override comment

ab9ae44... by Vladimir Petko on 2023-03-28

add override for test jar files

a612f7e... by Vladimir Petko on 2023-03-28

update exclusion and copyright link

f90f5d7... by Vladimir Petko on 2023-03-28

remove sources excluded by repack

f71412e... by Vladimir Petko on 2023-03-28

jquery is not used in 7.5, remove

5fc982b... by Vladimir Petko on 2023-03-28

Update upstream source from tag 'upstream/7.5'

Update to upstream version '7.5'
with Debian dir 51e135d5538c8681acba89f78832bc77d8f82cd8

diff --git a/.classpath b/.classpath
deleted file mode 100644
index a47380d..0000000
--- a/.classpath
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src/generated/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.classpath-linux b/.classpath-linux
deleted file mode 100644
index d05023c..0000000
--- a/.classpath-linux
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/test/java"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
-  <classpathentry kind="lib" path="lib/ant-1.6.5.jar"/>
-  <classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
-  <classpathentry kind="lib" path="lib/guice-2.0.jar"/>
-  <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
-  <classpathentry kind="output" path="z_build"/>
-</classpath>
diff --git a/.classpath-mac b/.classpath-mac
deleted file mode 100644
index d05023c..0000000
--- a/.classpath-mac
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/test/java"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
-  <classpathentry kind="lib" path="lib/ant-1.6.5.jar"/>
-  <classpathentry kind="lib" path="lib/bsh-2.0b4.jar"/>
-  <classpathentry kind="lib" path="lib/guice-2.0.jar"/>
-  <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
-  <classpathentry kind="output" path="z_build"/>
-</classpath>
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..461ba5b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,44 @@
+root = true
+
+[*]
+max_line_length = 100
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+
+[{*.sh,gradlew}]
+end_of_line = lf
+
+[{*.bat,*.cmd}]
+end_of_line = crlf
+
+[*.md]
+# Trailing space means "paragraph continues" in markdown
+trim_trailing_whitespace = false
+
+[*.java]
+indent_size = 2
+ij_continuation_indent_size = 4
+# Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
+# $ means "static"
+ij_java_wrap_long_lines = true
+ij_java_wrap_comments = true
+ij_java_imports_layout = $*,|,*
+ij_java_use_single_class_imports = true
+# Below does not seem to work as of 2021.1.1 even though
+# https://youtrack.jetbrains.com/issue/IDEA-225733 is resolved
+wildcard_import_limit = 999
+ij_kotlin_name_count_to_use_star_import = 999
+ij_kotlin_name_count_to_use_star_import_for_members = 999
+ij_java_class_count_to_use_import_on_demand = 999
+ij_java_names_count_to_use_import_on_demand = 999
+
+[*.js]
+indent_size = 2
+
+[*.xml]
+indent_size = 2
+
+[{*.yml,*.yaml}]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index cc89f26..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-.ant-targets*
-.classpath
-.gitignore
-.gradle
-.idea
-.project
-.settings
-/_eclipse/
-/local.properties
-TESTNG-*
-build
-eclipse-build
-gradle.properties
-ivy*
-javadocs
-kobaltBuild
-lib
-maven-testng-plugin-1.2.jar
-nb-configuration.xml
-out
-src/generated
-src/test/java/test/ignore
-target
-test-output
-test-output-tests
-testng.iml
-z_build
-.kobalt
-.DS_Store
-
diff --git a/.project b/.project
deleted file mode 100644
index 33d1108..0000000
--- a/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testng</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2cfe765..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-  - oraclejdk7
-  - openjdk7
-
-script:
-  - ./gradlew check --stacktrace --info
-after_success:
-  - ./travis.sh deploy
-  - ./travis.sh sonarqube
-
diff --git a/ANNOUNCEMENT.txt b/ANNOUNCEMENT.txt
index abb2222..0565cc3 100644
--- a/ANNOUNCEMENT.txt
+++ b/ANNOUNCEMENT.txt
@@ -1,7 +1,7 @@
 javalobby.org
 testdriven.com
 opensourcetesting.org
-http://saloon.javaranch.com/cgi-bin/ubb/ultimatebb.cgi?ubb=forum&f=68
+https://saloon.javaranch.com/cgi-bin/ubb/ultimatebb.cgi?ubb=forum&f=68
 java.net
 comp.lang.java.programmer
 
@@ -15,11 +15,11 @@ to transparently distribute tests on many machines and collect their results.
 
 Announcement:
 
-http://beust.com/weblog/archives/000361.html
+https://beust.com/weblog/archives/000361.html
 
 Details on Distributed TestNG:  
 
-http://beust.com/weblog/archives/000362.html
+https://beust.com/weblog/archives/000362.html
 
 
 ==========
@@ -28,11 +28,11 @@ The TestNG team is happy to announce the immediate availability of TestNG 4.0, w
 
 The announcement, along with a few examples and summary of the new features, can be found here:
 
-    http://tinyurl.com/dxlbh
+    https://tinyurl.com/dxlbh
 
 -- 
-C�dric
-http://testng.org
+C�dric
+https://testng.org
 
 ================
 
@@ -40,7 +40,7 @@ Announcing TestNG 2.3
 
 The TestNG team is happy to announce the availability of TestNG 2.3.
 
-The version is available at http://beust.com/testng as well as the new documentation, which has been considerably improved (highlighted code snippets, detailed DTD, ant task and description of all the new features).
+The version is available at https://beust.com/testng as well as the new documentation, which has been considerably improved (highlighted code snippets, detailed DTD, ant task and description of all the new features).
 
 What's new:
 
@@ -61,7 +61,7 @@ Try it and let us know what you think!
 
 ===
 
-I am happy to announce the availability of TestNG 2.1 (http://beust.com/testng).  
+I am happy to announce the availability of TestNG 2.1 (https://beust.com/testng).
 
 TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use, such as:
 
@@ -73,7 +73,7 @@ TestNG is a testing framework inspired from JUnit and NUnit but introducing some
 
 Some of the new features in this version include:
 
-    * invocationCount and successPercentage, which I described in a previous entry (http://beust.com/weblog/archives/000236.html), and which allow you to invoke a test method a certain number of times while allowing some of these invocations to fail.  If the number of failures is under a certain threshold, the test is still considered a success.
+    * invocationCount and successPercentage, which I described in a previous entry (https://beust.com/weblog/archives/000236.html), and which allow you to invoke a test method a certain number of times while allowing some of these invocations to fail.  If the number of failures is under a certain threshold, the test is still considered a success.
        
     * timeOut is now applicable to all test methods.  Whether you are running your tests in parallel or not, you can specify a time-out for your test method and if it fails to complete within the given amount of time, TestNG will mark it as a failure.
        
@@ -91,7 +91,7 @@ Announcing TestNG for Eclipse
 
 The TestNG team is happy to announce the first release of the TestNG plug-in for Eclipse.
 
-http://beust.com/testng
+https://beust.com/testng
 
 This first release covers the basic functionalities of TestNG, among which:
 
@@ -100,11 +100,11 @@ This first release covers the basic functionalities of TestNG, among which:
 
 A more detailed overview can be found here:
 
-http://beust.com/weblog/archives/000261.html
+https://beust.com/weblog/archives/000261.html
 
 and the documentation and snapshots here:
 
-http://beust.com/testng/main.html#eclipse
+https://beust.com/testng/main.html#eclipse
 
 -- 
 Cedric
diff --git a/CHANGES.txt b/CHANGES.txt
index fb5ca6d..17b5d25 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,465 @@
-Current
+Current
+Fixed: GITHUB-2701: Bump gradle version to 7.3.3 to support java17 build (ZhangJian He)
+Fixed: GITHUB-2646: Streamline Logging Across TestNG (Krishnan Mahadevan)
+Fixed: GITHUB-2658: Inheritance + dependsOnMethods (Krishnan Mahadevan)
+Fixed: GITHUB-2664: Order for DependsOnGroups has changed after TestNg 7.4.0 (Krishnan Mahadevan)
+Fixed: GITHUB-2501: TestNG 7.4.0 throws an exception "sun.net.www.protocol.file.FileURLConnection cannot be cast to java.net.HttpURLConnection" when xml file contain "ENTITY SYSTEM" grammer (Krishnan Mahadevan)
+Fixed: GITHUB-2693: TestNG ignores 'dataproviderthreadcount' CLA (Krishnan Mahadevan)
+Fixed: GITHUB-2685: TestInvoker should clear Thread.interrupted flag before calling ITestListeners (Roman Morskyi)
+Fixed: GITHUB-2684: AfterGroups config annotation does not consider retries for tests (Roman Morskyi)
+Fixed: GITHUB-2689: Yaml parser: implement loadClasses flag (Dzmitry Sankouski)
+Fixed: GITHUB-2676: NPE is triggered when working with ITestObjectFactory (Krishnan Mahadevan)
+Fixed: GITHUB-2674: Run onTestSkipped for each value from data provider (Krishnan Mahadevan)
+Fixed: GITHUB-2672: Log real stacktrace when test times out. (cdalexndr)
+Fixed: GITHUB-2669: A failed retry with ITestContext will lose the ITestContext. (Nan Liang)
+Fixed: GITHUB-2643: assertEquals(Set,Set) now ignores ordering as it did before. (Elis Edlund)
+Fixed: GITHUB-2653: Assert methods requires casting since TestNg 7.0 for mixed boxed and unboxed primitives in assertEquals.
+Fixed: GITHUB-2229: Restore @BeforeGroups and @AfterGroups Annotations functionality (Krishnan Mahadevan)
+Fixed: GITHUB-2563: Skip test if its data provider provides no data (Krishnan Mahadevan)
+Fixed: GITHUB-2535: TestResult.getEndMillis() returns 0 for skipped configuration - after upgrading testng to 7.0 + (Krishnan Mahadevan)
+Fixed: GITHUB-2638: "[WARN] Ignoring duplicate listener" appears when running .xml suite with <listeners> and <suite-files> (Krishnan Mahadevan)
+Fixed: GITHUB-1297: Passed configuration methods appear in testng-failed.xml, when failure was after passed test (Dzmitry Sankouski)
+New: Decouple configuration unit tests from main suite (Dzmitry Sankouski).
+Fixed: GITHUB-2536: Problems with Nested Test Classes (Krishnan Mahadevan)
+Fixed: GITHUB-2558:Make IExecutionListener, ITestListener, IInvokedMethodListener, IConfigurationListener, ISuiteListener finish method with reverse order (dianny)
+Fixed: GITHUB-2532: Apply commandline switches for suites in jar files (Dzmitry Sankouski).
+Fixed: GITHUB-2558: Make IExecutionListener, ITestListener, IInvokedMethodListener, IConfigurationListener, ISuiteListener execute in the order of insertion (Krishnan Mahadevan)
+Fixed: GITHUB-2611: Config Failures not included in testng-failed.xml when its part of a different test class (Krishnan Mahadevan)
+Fixed: GITHUB-2613: Ignored Tests are not retrieved for a mixed test class (test with enabled, disabled and ignored test method) (Krishnan Mahadevan)
+Fixed: GITHUB-849: Performance improvement by fixing hashCode (testn & Vladimir Sitnikov)
+Fixed: GITHUB-2570: Use Guice injector for instantiate IRetryAnalyzer (Krishnan Mahadevan)
+Fix: use proper instances for beforeClass callback when different instances collide on hash codes
+Fixed: Fix parallel and configfailurepolicy parsing in tr_TR locale
+Fixed: Wrong results from GuiceBasedObjectDispenser when there's Object#hashCode collision
+Changed: GITHUB-2564: Source code is split into several modules for better modularity in the future (for now only a combined jar is released as it was before)
+Added: GITHUB-2564: Added license files as META-INF/LICENSE.txt within the released jar
+Test: GITHUB-2564: Added pax-exam-based OSGi test to verify the manifest
+Changed: GITHUB-2564: Migrated the build to Gradle 7.0.2
+Fixed: GITHUB-2576: Guice 5.0 drops no-aop variant, so TestNG should probably upgrade and avoid no-aop dependency (Nan Liang)
+Fixed: GITHUB-2566: Reporter#getOutput(ITestResult tr) uses Map.get(tr.hashCode()) which might result in surprising results (Krishnan Mahadevan)
+Fixed: GITHUB-2565: Dataprovider only supporting a raw type for Iterator return type (Krishnan Mahadevan)
+Fixed: GITHUB-2557: Flaky test: ThreadAffinityTest#testThreadAffinity (Krishnan Mahadevan)
+Fixed: GITHUB-2567: MethodHelper#CANONICAL_NAME_CACHE is never reset, so it could result in a memory leak (Krishnan Mahadevan)
+Fixed: GITHUB-2540: assertEquals(Collection) need check order (Stuart Marks & Julien Herr)
+Fixed: GITHUB-2360: Groovy 3 internal generated methods are detected as test methods (Ian Springer)
+Fixed: GITHUB-2522: TestNG 7.4.0 Can not skip test through listener (Nan Liang)
+Fixed: GITHUB-2529: Link to testng.xml in CONTRIBUTING.md file was dead
+Fixed: GITHUB-2521: The method has a separate string with 'invocation-number' parameters for each failure (does not group) in 'testng-failed.xml' file for DataProvider + Factory (Pavel Sakharchuk)
+Fixed: GITHUB-2426: New feature TestNG - getFactoryMethodParamsInfo on ConfigurationMethod (Krishnan Mahadevan)
+Fixed: GITHUB-2517: Factory data-provider parameters not displayed in 'testng-failed.xml' file (Pavel Sakharchuk)
+Fixed: GITHUB-279: Guice dependency injection into listeners and reporters (Krishnan Mahadevan)
+Fixed: GITHUB-2504: Data provider data cannot be populated to onTestStart hook when BeforeMethod is failed (Krishnan Mahadevan)
+Fixed: GITHUB-2489: Hierarchical base- and test-class @AfterClass methods out of order using groups (Krishnan Mahadevan)
+Fixed: GITHUB-2493: Avoid NPE from TextReporter execution when a dataprovider method provides null (baflQA)
+Fixed: GITHUB-2483: Asymmetric not equals (cdalexndr)
+Fixed: GITHUB-2486: assertSame/assertNotSame broken after GITHUB-2296 (Vitalii Diravka)
+Fixed: GITHUB-2490: assertNotEquals returns fast when argument is null, not calling equals(Object) (Anindya Roy)
+Fixed: GITHUB-2500: Mention in assertEqualsNoOrder doc that arrays are not compared deeply (Marcono1234)
+Fixed: GITHUB-2544: TestNG Retry Fails on complex data-provider arguments (Anindya Roy)
+
+7.4.0
+New  : GITHUB-2459: Support configurable start time - emailable report (Barry Evans)
+Fixed: GITHUB-2467: XmlTest does not copy the xmlClasses during clone (C.V.Aditya)
+Fixed: GITHUB-2469: Parameters added in XmlTest during AlterSuiteListener not available in SuiteListener (C.V.Aditya)
+Fixed: GITHUB-2296: Fix for assertEquals not working for sets as order is not guaranteed. (Prashant Maroti)
+Fixed: GITHUB-2465: Fix bux where Strings.join returns empty String
+Fixed: GITHUB-1632: throwing SkipException sets iTestResult status to Failure instead of Skip (Julien Herr & Krishnan Mahadevan)
+New  : GITHUB-2456: Add onDataProviderFailure listener (Krishnan Mahadevan)
+Fixed: GITHUB-2445: NPE in FailedReporter.java With Tests Created in Factory (Arham Jain)
+Fixed: GITHUB-2428: Configuration methods have the same test class instance when @Factory is being used (Nan Liang)
+Fixed: GITHUB-2440: Fixed an issue when case timeout returned an incorrect exception and effect the next other test case (Yao Ma)
+New:   GITHUB-2407: Adds "overrideIncludedMethods" to the global config as a command-line argument, which excludes explicitly included test methods if they belong to any excluded groups (Nikhil Suri)
+Fixed: GITHUB-2432: Rework MethodInheritance.fixMethodInheritance to "soft" dependencies (Krishnan Mahadevan)
+Fixed: GITHUB-2429: Seggregate Dependency Injection out as a clear implementation (Krishnan Mahadevan)
+Fixed: GITHUB-2435: getParameterIndex() always return 0 in test listener
+Fixed: GITHUB-2406: TestNG 7.3.0 transitive vulnerability CVE-2020-11022 and CVE-2020-11023 due to JQuery 3.4.1  (Krishnan Mahadevan)
+Fixed: GITHUB-2405: Regression: Using TestNG via Maven breaks when optional Guice dependency is unavailable (Krishnan Mahadevan)
+Fixed: GITHUB-2427: Guice module (suite parent-module and test module) configure() method is called multiple times (Jacek Centkowski)
+Fixed: GITHUB-2419: TestNG JUnit reports are not valid if system output contains XML tags (Lorenzo Orsatti)
+Fixed: GITHUB-188: suite parallel="methods" does not work when there are multiple <test> tags in the testng.xml (Krishnan Mahadevan)
+Fixed: GITHUB-346: When a method is annotated with both BeforeGroups and AfterGroups only AfterGroup is executed (Krishnan Mahadevan)
+Fixed: GITHUB-2403: Suite.xml files attempt to make web request when suite references standard TestNG DTD using HTTP (Krishnan Mahadevan)
+New:   GITHUB-2385: Make @Listeners can work for implemented interfaces and Inherited class (Nan Liang)
+Fixed: GITHUB-2053: MethodHelper.collectAndOrderMethods() Hangs when Parallel Instance and dependsOnGroups (Krishnan Mahadevan)
+Fixed: GITHUB-2400: BeforeClass/Method (and AfterClass/Method) configuration methods that override default methods are invoked multiple times (Krishnan Mahadevan)
+Fixed: GITHUB-2396: @Ignore on method level doesn't work as expected (Krishnan Mahadevan)
+Fixed: GITHUB-2382: TestNG version should be specified in MANIFEST.MF (Krishnan Mahadevan)
+Fixed: GITHUB-2096: 7.0.0-beta6 memory issues (regression) (Krishnan Mahadevan)
+Fixed: GITHUB-2355: TestNG creates multiple Guice Module Instances (Krishnan Mahadevan)
+Fixed: GITHUB-2374: Add file name to the warning message (Krishnan Mahadevan)
+Fixed: GITHUB-2321: -Dtestng.thread.affinity=true do not work when running multiple instance of test in parallel (Nan Liang)
+Fixed: GITHUB-2363: JS error when switching theme (Krishnan Mahadevan)
+Fixed: GITHUB-2361: No way to enforce @Test(singleThreaded = true) when test defined in base class (Krishnan Mahadevan)
+Fixed: GITHUB-2343: Injectors are not reused when they share the same set of modules (Krishnan Mahadevan)
+Fixed: GITHUB-2346: ITestResult attributes are null when retrieved by Listener onTestStart if test fails at BeforeMethod (Krishnan Mahadevan)
+Fixed: GITHUB-2357: TestNG 7.3.0 transitive dependencies
+
+7.3.0
+Fixed: GITHUB-2328: Add ability to get test method for which configuration method was called (Krishnan Mahadevan)
+Fixed: GITHUB-2327: Parameters not present on skipped Test (Eric Kubenka)
+Fixed: GITHUB-2232: Null Pointer Exception in ConfigInvoker.setMethodInvocationFailure (Krishnan Mahadevan)
+Fixed: GITHUB-2312: IAnnotationTransformer called multiple time Discrepancy between 6.x and 7.x (Krishnan Mahadevan)
+New:   GITHUB-2315: TextReporter console output does not nicely print native array data parameters (James Sassano)
+Fixed: GITHUB-2301: Add support for object-based reporter configurations (Scott Babcock)
+New: Deprecate org.testng.ReporterConfig (Julien Herr)
+Fixed: GITHUB-2300: Vulnerable Dependency: Please upgrade JCommander to 1.75 or above (Krishnan Mahadevan)
+Fixed: GITHUB-2182: Removed exception catching as valid behaviour
+Fixed: GITHUB-2273: Use SPI to load Guice modules (Bartosz Popiela)
+Fixed: GITHUB-2280: Prevent Retry from happening endlessly (Paweł Nadolski)
+Fixed: GITHUB-553:  Better error message when dealing with classes having both Constructor and Factory methods (Krishnan Mahadevan)
+Fixed: GITHUB-2267: RetryAnalyzer is not set properly and consistent when using dataprovider (Eric Kubenka)
+Fixed: GITHUB-2266: Support Test retries via Callbacks (Krishnan Mahadevan)
+Fixed: GITHUB-2209: @Before and @After are not executed as expected when a combination of class and method level grouping is applied (Krishnan Mahadevan)
+Fixed: GITHUB-2259: Missing configuration for ServiceLoader Listeners (Krishnan Mahadevan)
+Fixed: GITHUB-2257: Facilitate retry of configuration methods via call backs (Krishnan Mahadevan)
+Fixed: GITHUB-2223: testng 7.1.0 java.lang.ClassNotFoundException: com.google.inject.Stage (Krishnan Mahadevan)
+Fixed: GITHUB-217: Configure TestNG to fail when all tests are skipped (Krishnan Mahadevan)
+Fixed: GITHUB-2255: Ensure test method parameters are visible in BeforeMethod config method (Krishnan Mahadevan)
+Fixed: GITHUB-2251: NullPointerException at test with timeOut (Krishnan Mahadevan)
+Fixed: GITHUB-2249: Not abstract super-classes mess up test run order (Sergii Kim)
+Fixed: GITHUB-2195: NPE Using groups and @Before/@AfterMethod with alwaysRun and dependsOnMethods (Tomas & Julien Herr)
+Fixed: GITHUB-2238: Parameter values should be overridable from JVM arguments (Krishnan Mahadevan)
+Fixed: GITHUB-2231: Incorrect hierarchy in testng.xml file created programmatically and failed to run. (Krishnan Mahadevan)
+Fixed: GITHUB-2235: expectedExceptions mismatch because of wrapping (Krishnan Mahadevan)
+Fixed: GITHUB-2220: ITestListener's methods get called multiple times for one test, when @Listeners annotation is used in multiple test classes (Krishnan Mahadevan)
+Fixed: GITHUB-2211: assertEquals for Map sometimes does not use provided message (Krishnan Mahadevan)
+Fixed: GITHUB-1632: throwing SkipException sets iTestResult status to Failure instead of Skip (Krishnan Mahadevan)
+Fixed: GITHUB-2207: Allow dependency injector factory to be configured via args (dmikhievich)
+Fixed: GITHUB-2193: Ignore local url for DTD security check (Li.Zhao & Julien Herr)
+Fixed: GITHUB-1968: Upgrade to Gradle 6.0
+
+7.1.0
+New  : GITHUB-2199: Allow users to provide their own Injector for Dependency Injection (Krishnan Mahadevan)
+Fixed: GITHUB-2180: Write scenario details for Retried tests (Devendra Raju K)
+Fixed: GITHUB-2124: JUnit Report should contain the output of org.testng.Reporter (Krishnan Mahadevan)
+Fixed: GITHUB-2171: Ability to embed attachments and make them available on TestNG XML report (Krishnan Mahadevan)
+Fixed: GITHUB-2152: Multiple Test Groups Causing @BeforeMethod and @AfterMethod to be called multiple times for a single test (Krishnan Mahadevan)
+Fixed: GITHUB-2172: Suite summary report table issue with EmailableReporter2.java (Devendra Raju K)
+Fixed: GITHUB-2148: TestNG - configfailurepolicy=“continue” is not working for retried test (Krishnan Mahadevan)
+Fixed: GITHUB-2163: Test is executed infinite number of times when the data provider returns a new object (Krishnan Mahadevan)
+Fixed: GITHUB-2157: NullPointerException occurs when a Retried test has an exception in DataProvider (Krishnan Mahadevan)
+Fixed: GITHUB-2150: Upgraded jQuery from 1.7.1 to 3.4.1 to resolve reported prototype pollution vulnerability
+Fixed: GITHUB-2149: Handle NoClassDefFoundError when classloader fails to load a class
+New:   GITHUB-2111: Provide an interceptor for Data Provider (Krishnan Mahadevan)
+Fixed: GITHUB-1709: @Ignore doesn't work when used on child class, and parent has multiple @Test methods (Krishnan Mahadevan)
+New:   GITHUB-2118: Default assertion message (Jiong Fu)
+Fixed: GITHUB-2080: Wrong text for assertTrue (Jiong Fu)
+Fixed: GITHUB-2078: Xml to Yaml does not capture the dependency definition in generated Yaml File (Jiong Fu)
+
+7.0.0
+Fixed: GITHUB-2137: Issue with Priority with too low values (Krishnan Mahadevan)
+Fixed: GITHUB-2138: Factory calls are not intercepted by IAnnotationTransformer (Krishnan Mahadevan)
+Fixed: GITHUB-2121: SoftAssert: allow custom message (dr29bart)
+Fixed: GITHUB-2110: NPE is thrown when running with Thread affinity (Krishnan Mahadevan)
+Fixed: GITHUB-2069: JUnit TestSuite not handled correctly in Reports (Krishnan Mahadevan)
+Fixed: GITHUB-2075: Thread interrupt flag persists between test methods (Krishnan Mahadevan)
+Fixed: GITHUB-2074: Thread Interrupted when using expectedException (Krishnan Mahadevan)
+Fixed: GITHUB-2802: some methods' javadoc in ISuiteListener and ITestListener is misleading (Yehui Wang)
+Fixed: GITHUB-2061: java.util.ConcurrentModificationException after registration of SuiteListener at the runtime (Krishnan Mahadevan)
+Fixed: GITHUB-2055: It's not possible to register a new ITestListener at the runtime (Krishnan Mahadevan)
+Fixed: GITHUB-1035: @BeforeClass not executed in parallel when parallel="instances" (Krishnan Mahadevan)
+Fixed: GITHUB-2043: IConfigurationListener is not executed and IDataProviderListener is not added to the list of the listeners if a new listener is added at the runtime (Krishnan Mahadevan)
+Fixed: GITHUB-1835: Configurable ThreadPoolExecutor (Krishnan Mahadevan)
+Fixed: GITHUB-1691: Support reading data provider information from Class level @Test annotation (Krishnan Mahadevan)
+Fixed: GITHUB-326: When group-by-instances is set to true the instances created by @Factory does not run in parallel (Krishnan Mahadevan)
+Fixed: GITHUB-1930: Running testng-failed.xml correctly runs failed test in child class but incorrectly runs all tests in base class (Krishnan Mahadevan)
+Fixed: GITHUB-1987: Retrieve the data provider method's reference from the test method (Krishnan Mahadevan)
+Fixed: GITHUB-1976: Add a proper message when types are missing during annotation parsing (Krishnan Mahadevan)
+Fixed: GITHUB-2000: ThreadPoolExecutor ConcurrentModificationException (Krishnan Mahadevan)
+Fixed: GITHUB-2022: Suite.xml files make web request when suite uses DTD over HTTPS (Krishnan Mahadevan)
+Fixed: GITHUB-2017: Don't use child injectors for Guice tests (Joe Barnett)
+New:   GITHUB-2003: Add to @Test interface fields IDs and issues (Krishnan Mahadevan)
+Fixed: GITHUB-2009: Test Timeout not respected in parallel="methods" mode (Krishnan Mahadevan)
+Fixed: GITHUB-2008: Preserve parameters in each class and not all of the test parameters
+Fixed: GITHUB-1981: Fixes NPE in Assert.assertEquals when an array contains null (Maneesh MS)
+New: Upgrade to gradle5
+New: Added a method in Assertion class to allow downstream TestNG consumers to override the error message (Ryan Laseter)
+Fixed: GITHUB-165: @AfterGroups is not executed when group member fails or is skipped (Krishnan Mahadevan)
+Fixed: GITHUB-118: @BeforeGroups only called if group is specified explicitly (Krishnan Mahadevan)
+Fixed: GITHUB-182: Inherited test methods do not get expected group behavior (Krishnan Mahadevan)
+Fixed: GITHUB-1988: Add Automatic-Module-Name to MANIFEST.MF (Krishnan Mahadevan)
+Fixed: GITHUB-1985: Custom "IMethodSelector" implementation doesn't filter methods properly (Krishnan Mahadevan)
+Fixed: GITHUB-993:  Handle null test names from ITest implementation (Krishnan Mahadevan)
+Fixed: GITHUB-1942: assertDeepEquals takes long time to evaluate size mismatch (Kumaran Bharathan)
+Fixed: GITHUB-1967: IInvokedMethod ITestResult status set as -1 for test methods skipped due to config failure (Krishnan Mahadevan)
+Fixed: GITHUB-1952: Provide a TestNGListener that can be invoked when a test fails due to a timeout (Krishnan Mahadevan)
+Fixed: GITHUB-1953: TestNG throws a misleading error when @Factory method returns empty array. (Krishnan Mahadevan)
+Fixed: GITHUB-1946: Retry analyzer does not work properly when coupled with a data provider (Krishnan Mahadevan)
+Fixed: GITHUB-1924: Testclass instantiation fails when both no-arg constructor and factory method present (Krishnan Mahadevan)
+Fixed: GITHUB-1935: Wrong text for assertEquals (Krishnan Mahadevan)
+Fixed: GITHUB-1931: [NPE] Reporter org.testng.reporters.jq.Main failed (Krishnan Mahadevan, Oleg Shaburov)
+New: Remove raw type warnings in ConversionUtils
+Fixed: GITHUB-1480: Parallel=methods not working when tests have different priorities set (Micah Lapping-Carr)
+Fixed: GITHUB-1041: Factory data-provider parameters not displayed in test-result (Krishnan Mahadevan)
+Fixed: GITHUB-1901: The overall reported Test time for suite containing parallel tests should be max(tests_times) (Krishnan Mahadevan)
+Fixed: GITHUB-1893: Streamline invocation of "init" method within TestResult to be private (Krishnan Mahadevan)
+Fixed: GITHUB-1892: Configurable InvokedMethodListener (Krishnan Mahadevan)
+Fixed: GITHUB-435: Apply <packages> at suite level to all tests (Siegmar Alber)
+Fixed: GITHUB-1870: Fix Ambiguous behavior of IInvokedMethodListener by clarifying javadocs(Krishnan Mahadevan)
+Fixed: GITHUB-1878: Provide visibility into the actual method (config/test) that caused a downstream test to be skipped (Krishnan Mahadevan)
+Fixed: GITHUB-1883: Establish Listener invocation order as tests for documentation purposes (Krishnan Mahadevan)
+Fixed: TestNG doesn't use the searchable loaders for JUnit tests (Igor Ignatev)
+Fixed: GITHUB-1880: @AfterGroups(alwaysRun = true) is not called if there is an exception in @BeforeGroups (Krishnan Mahadevan)
+Fixed: GITHUB-1874: Prevent circular dependency error when suite includes different methods from same class (Krishnan Mahadevan)
+Fixed: GITHUB-1863: IMethodInterceptor will be invoked twice when listener implements both ITestListener and IMethodInterceptor via eclipse execution way.(Bin Wu)
+Fixed: GITHUB-1865: testngXmlPathInJar- cannot be cleared when vm terminate(Yehui Wang)
+Fixed: GITHUB-1850: Parser returns a wrong structure when parent suite has duplicate child suites (Chao Qin)
+Fixed: GITHUB-1803: Added new methods for comparing float and double arrays with delta (Atul Agrawal)
+Fixed: GITHUB-1661: Fixed Assert logic for two dimensional arrays (Atul Agrawal)
+Fixed: GITHUB-1734: Added unit tests for NaN, Max, Min, Positive and Negative infinity (Atul Agrawal)
+Fixed: GITHUB-1740: Bumped up artifact version of dependencies for java 8 support (Atul Agrawal)
+Fixed: GITHUB-1834: Ensure group dependency defined via suite xml is considered (Krishnan Mahadevan)
+New  : Expose Graph Visualisation representation for users to build real-time debugging tools (Krishnan Mahadevan)
+Fixed: GITHUB-574: String cannot be cast to Integer if log property is set in maven pom.xml (Krishnan Mahadevan)
+Fixed: GITHUB-1402: TestNG reporting - Quickly identify Retry-d Tests (Krishnan Mahadevan)
+Fixed: GITHUB-1697: Need ability to mark "failed but up for retry" tests differently from "skipped" tests (Krishnan Mahadevan)
+Fixed: GITHUB-1810: Nullpointer exception when running TestNG tests from CMD (Krishnan Mahadevan)
+Fixed: GITHUB-1590: Started configuration method has wrong status and end time during execution (Krishnan Mahadevan)
+Fixed: GITHUB-298: Avoid Javascript errors in function name when suite name has special characters (Krishnan Mahadevan)
+Fixed: GITHUB-1048: Fix validation errors in TestNG CSS to adhere to CSS level 3 + SVG (Krishnan Mahadevan)
+Fixed: GITHUB-341: TestNG does not respect "-parallel classes" when running with a jar file (Krishnan Mahadevan)
+Fixed: GITHUB-1790: IAnnotationTransformer transform method is not called for all test classes annotated with @Test (Krishnan Mahadevan)
+Fixed: GITHUB-1787: Method level parameters are missing when using Yaml generation utilities (Krishnan Mahadevan)
+New  : TestNG now guarantees thread-affinity for methods that use either preserve-order (or) dependsOnMethods (Krishnan Mahadevan)
+Fixed: GITHUB-1773: Parallel="classes" executes methods of test class in different threads (Krishnan Mahadevan)
+Fixed: GITHUB-1185: DependsOnMethods made parallel class use several threads (Krishnan Mahadevan)
+Fixed: GITHUB-1173: Parallel="classes" executes methods of test class in different threads (Krishnan Mahadevan)
+Fixed: GITHUB-1066: Regression is in priority. It broke parallel mode (Krishnan Mahadevan)
+Fixed: GITHUB-1050: Parallel classes runs methods from one class in different threads, interleaves two classes in one thread (Krishnan Mahadevan)
+Fixed: GITHUB-89: parallel="classes" is not forcing test methods from the same testClass to be run in the same thread as it is suposed to (Krishnan Mahadevan)
+Fixed: GITHUB-1719: successPercentage does not work correctly for tests with dataProvider (Krishnan Mahadevan)
+Fixed: GITHUB-1241: Streamline Retry Analyzer usage when same test is run multiple times (Krishnan Mahadevan)
+Fixed: GITHUB-1777: ITestListener.onTestStart() not called after fail or skip from @BeforeMethod (Krishnan Mahadevan)
+Fixed: GITHUB-1778: SoftAssert#fail swallows actual root cause (Krishnan Mahadevan)
+Fixed: GITHUB-1665: Failed test after rerun would impact next test case result (Yehui Wang)
+Fixed: GITHUB-1770: Factory annotation does not work with Parameters annotation on method constructor (Krishnan Mahadevan)
+Fixed: GITHUB-1767: Prevent NPE when XmlTest accessed without a proper XmlSuite (Krishnan Mahadevan)
+Fixed: GITHUB-1766: Testng generates a lot of temp folders like testngXmlPathInJar- (Andrey)
+Fixed: GITHUB-1759: core interfaces refactoring to support default methods (Sergey Korol)
+Fixed: GITHUB-1753: TestResult for an SKIP test lose attributes contributed by @BeforeMethod's or @AfterMethod's (Krishnan Mahadevan)
+Fixed: GITHUB-1756: ITest .getTestName() doesn't return the actual test name for skipped methods (Krishnan Mahadevan)
+Fixed: GITHUB-1602: beforeInvocation method don't get called for skipped tests (Krishnan Mahadevan)
+Fixed: GITHUB-549 and GITHUB-780: Introduce onlyForGroups attribute for @BeforeMethod and @AfterMethod (Sergei Tachenov)
+Fixed: GITHUB-1745: Support native injection for @Factory methods (Krishnan Mahadevan)
+Fixed: GITHUB-1746: Make InvokedMethodNameListener thread-safe, fixing occasional build failures (Sergei Tachenov)
+Fixed: GITHUB-1538: Dependent methods don't get invoked when a failed test method is retried via a RetryAnalyser (Krishnan Mahadevan)
+Fixed: GITHUB-426: firstTimeOnly ignored for threadPoolSize > 1 (Krishnan Mahadevan)
+Fixed: GITHUB-466: JUnitReportReporter always converts the system time into GMT (Krishnan Mahadevan)
+Fixed: GITHUB-1723: Standardize timezone reference in XML reports (Krishnan Mahadevan)
+Fixed: GITHUB-489: Incorrect timezone info in <test-method> element of testng-results.xml (Krishnan Mahadevan)
+Fixed: GITHUB-1735: IExecutionListener.onStart() running twice when used as annotation (Krishnan Mahadevan)
+New  : Removed deprecated methods across TestNG (Krishnan Mahadevan)
+Fixed: GITHUB-1726: Allow user-defined method interceptors to have the last say in method re-ordering (Krishnan Mahadevan)
+Fixed: GITHUB-564: Support using @Optional on @Test method parameters to use null values (Krishnan Mahadevan)
+New  : Upgrade TestNG to start needing at-least JDK8 (Krishnan Mahadevan)
+Fixed: GITHUB-1637: Remove dependency on a pre-created jar for running unit tests for JarFileUtils (Krishnan Mahadevan)
+Fixed: GITHUB-1710: Inefficient DynamicGraph causes hang with only 100 tests. (Steve Prentice)
+Fixed: GITHUB-1716: Potential NPE in jq.Main reporter (Krishnan Mahadevan)
+Fixed: GITHUB-1709: @Ignore doesn't work when used on child class, and parent has @Test methods (Krishnan Mahadevan)
+Fixed: GITHUB-1706: Retrying of methods fail when test method involves native injection (Krishnan Mahadevan)
+New  : Removed deprecated attributes from annotations (Julien Herr)
+New  : Support all JSR-223 compatible script engine
+Fixed: GITHUB-1827: TestNG does not throw an error when a test class does not have a proper constructor (Julien Herr & Krishnan Mahadevan)
+Fixed: Annotated default methods of indirectly implemented interfaces should still be called (Ilya Korobitsyn)
+New  : GITHUB-2105: Include assertEquals(Map, Map) into Assert class
+
+6.14.3
+Fixed: GITHUB-1077: TestNG cannot handle load (Aheiss)
+Fixed: GITHUB-1081: group-by-instances with test dependencies causes instantiation of tests to exponentially slow (Aheiss)
+Fixed: GITHUB-1700: Test ignored if @BeforeMethod in base class fails for another test class (Krishnan Mahadevan)
+Fixed: GITHUB-1694: @BeforeGroups executed multiple times when tests run in parallel, once if not parallel (Krishnan Mahadevan)
+Fixed: GITHUB-1688: @Ignore annotation on base class doesn't ignore tests in child classes (Krishnan Mahadevan)
+Fixed: GITHUB-1687: NullPointerException is thrown when beanshell evaluates to null (Krishnan Mahadevan)
+
+6.14.2
+Fixed: GITHUB-1674: beanshell methodselector applied at suite level is ignored (Krishnan Mahadevan)
+Fixed: GITHUB-1668: "Invalid Method Selector" exception triggered when using suite level beanshell methodselectors (Krishnan Mahadevan)
+Fixed: GITHUB-1659: New line characters are removed from stack traces in testng-results.xml (Krishnan Mahadevan)
+Fixed: GITHUB-1503: Consider adding a -n (no execute) option (Krishnan Mahadevan)
+Fixed: GITHUB-1648: Depends on method is not respected on the sequential run on second test that extends same base testClass (Krishnan Mahadevan)
+Fixed: GITHUB-1636: Parallel test run is not working in 6.13.1 (Krishnan Mahadevan)
+New  : GITHUB-1634: Make "-xmlpathinjar" support <suite-files> (Yehui Wang)
+New  : GITHUB-1634: Make "-testnames" find tests from Multi-level parent-child suites (Yehui Wang)
+Fixed: GITHUB-1641: The time for test-method is 8 hours ahead of the the time for suite/class in testng-result xml file (Krishnan Mahadevan)
+Fixed: GITHUB-1649: @Test annotated methods cannot inject java.lang.reflect.Method (Krishnan Mahadevan)
+Fixed: GITHUB-1625: Null fields in parallel method tests (Krishnan Mahadevan)
+Fixed: GITHUB-1605: Research the usefulness of the JVM argument "experimental" (Krishnan Mahadevan)
+New  : GITHUB-1631: data provider class name injection into Factory meta-data (Sergey Korol)
+
+6.13.1
+No functional changes. Released with newer version JCommander (1.72.0)
+
+6.13
+Fixed: GITHUB-1619: ConcurrentHashMap doesn't secure insertion order.(Yehui Wang)
+Fixed: GITHUB-1616: Test cases with priority and dependsOnGroups dependencies, execution order is chaos. (Yehui Wang)
+Fixed: GITHUB-1613: The constructor removed from TestRunner would stop Eclipse working.(Yehui Wang)
+Fixed: GITHUB-1600: Updated in afterInvocation() testResult.status is not used in willRetry condition (Krishnan Mahadevan)
+Fixed: GITHUB-1598: Injected types parameter and optional parameters cannot be used together. (Yehui Wang)
+Fixed: GITHUB-1594: Cannot filter by "testnames" when suite xml is a suite of suites (Krishnan Mahadevan)
+Fixed: GITHUB-1584: Can't run tests from IDEA (Krishnan Mahadevan)
+Fixed: GITHUB-1589: TestNGAntTask should be consistently using the Ant Log API for writing log messages (Krishnan Mahadevan)
+Fixed: GITHUB-1587: TestNG can not guarantee the ExecutionListener Instance as singleton(Yehui Wang)
+Fixed: GITHUB-217: exception in DataProvider doesn't fail test run (Krishnan Mahadevan)
+Fixed: GITHUB-987: Parameters threadCount and parallel doesn't work with maven (Krishnan Mahadevan)
+Fixed: GITHUB-1472: Optimize DynamicGraph.getUnfinishedNodes (Krishnan Mahadevan & Nathan Reynolds)
+Fixed: GITHUB-1566: Invalid XML characters in Params in testng-results.xml (Krishnan Mahadevan)
+Fixed: GITHUB-1554: @Parameters and parameter injection not wroking when used on the same method (Krishnan Mahadevan)
+Fixed: GITHUB-990: NullPointerExceptions after a superclass configuration method fails with configfailurepolicy="continue" (Krishnan Mahadevan)
+Fixed: GITHUB-461 : Annotate annotations with @Documented (Krishnan Mahadevan)
+Fixed: GITHUB-778 : XmlSuite toXml() does NOT add the suite time-out property (Krishnan Mahadevan)
+Fixed: GITHUB-1029: Issue with getting XmlTest from test method (Krishnan Mahadevan)
+Fixed: GITHUB-212: Enable support for providing a URI as suite file location (Krishnan Mahadevan)
+Fixed: GITHUB-161 : Provide a way to customize SAXParserFactory implementation (Krishnan Mahadevan)
+Fixed: GITHUB-1455: Configure XML output of XmlSuite (Krishnan Mahadevan)
+Fixed: GITHUB-1465: Failure policy CONTINUE handling is broken for tests that are skipped in @BeforeMethod method (Krishnan Mahadevan)
+Fixed: GITHUB-1533: Duplicate child suites get added when working with parent/child suite scenario (Krishnan Mahadevan)
+Fixed: GITHUB-949: dependsOnMethods with alwaysRun = true and inheritance fails to find method (Krishnan Mahadevan)
+Fixed: GITHUB-1519: Possibility to retry a test until it FAILED (Krishnan Mahadevan)
+Fixed: GITHUB-980: TestNG run inherited method twice (Krishnan Mahadevan)
+Fixed: GITHUB-1409: Regression: on expectedExceptionsMessageRegExp expected and actual messages are not printed (Krishnan Mahadevan)
+Fixed: GITHUB-1517: TestNG exits with a zero when there are configuration failures (Krishnan Mahadevan)
+New  : GITHUB-1490: Add a listener for data provider interception (Krishnan Mahadevan)
+Fixed: GITHUB-1456: Remove/Warn support of constructor with String param (Krishnan Mahadevan)
+Fixed: GITHUB-1509: Improve error message when data provider returns a null value (Krishnan Mahadevan)
+Fixed: GITHUB-1507: TestNG runs all methods when filtering via <include> fails (Krishnan Mahadevan)
+Fixed: GITHUB-1493: Wrong exception msg when timeout on test (Krishnan Mahadevan)
+Fixed: GITHUB-328: Attempt to fix unnecessary execution of @Factory-ctors (@beverage & Julien Herr)
+Fixed: GITHUB-1384: Huge performance issue between 6.5.2 and 6.11 (Denis Bazhenov)
+New: Remove Serializable (Julien Herr)
+Fixed: GITHUB-1496: If method contains "$", run only one method, all methods will be run (@JF-Rabbit & Julien Herr)
+Fixed: GITHUB-1220: Recognize annotations on default methods in implemented interface
+New: GITHUB-861: Add @Ignore annotation which disables all tests in a class or a package (Julien Herr)
+
+6.12
+Fixed: GITHUB-1484: Remove irrelevant "targets" for TestNG annotations (Krishnan Mahadevan)
+Fixed: GITHUB-1405: Skip considering main() method when @Test used at class level (Krishnan Mahadevan)
+Fixed: GITHUB-799: @Factory with dataProvider changes order of iterations (Krishnan Mahadevan & Julien Herr)
+New: Enhance XML Reporter to be able to customize the file name (Krishnan Mahadevan)
+Fixed: GITHUB-1417: Class param injection is not working with @BeforeClass (Krishnan Mahadevan)
+Fixed: GITHUB-1440: Improve error message when wrong params on configuration methods (Krishnan Mahadevan)
+Fixed: GITHUB-1433: Missing encoding for emailable reports (Shaburov Oleg)
+Fixed: GITHUB-1430: Cannot load class from file XXX when using with ant and classfileset (Olivier Mourez)
+Fixed: GITHUB-1394: Optimize ClassHelper.getAvailableMethods() to exclude Object class(Nathan Reynolds & Krishnan Mahadevan)
+Fixed: GITHUB-1396: Order established by IMethodInterceptor not honored when running with parallel='instances' (Ryan Scott)
+Fixed: GITHUB-1287: Parallel (methods) execution with dependsOn running in unexpected order (Kevyn Reinholt)
+Fixed: GITHUB-1362: Ensure AfterGroups methods get executed when involving Method Interceptors (Krishnan Mahadevan)
+Fixed: GITHUB-765: Skip invocation of bridged methods (Krishnan Mahadevan)
+New: Enhance TestNGAntTask to be customizable (Denys Kurylenko)
+New: Make EmailableReporter2 W3C Compliant[XHTML 1.1] (Chris Rankin)
+Fixed: GITHUB-1336: (parallel=‘classes’) not working when coupled with priority (Krishnan Mahadevan)
+Fixed: GITHUB-1365: Be able to override default XML parser (@ChristiKh & Julien Herr)
+Fixed: GITHUB-1360: TestNG does not distinguish between methods of different priorities (Krishnan Mahadevan)
+Fixed: GITHUB-1144: Add Class and Constructor as legal native dependency injection (Guillaume Juillot)
+Fixed: GITHUB-1380: Circular dependencies may fail in parallel (Julien Herr)
+Fixed: GITHUB-1400: TestNG, Multiple duplicate listener warnings on implementing multiple listener interfaces (@bipo1980 & Nick Tan)
+Fixed: GITHUB-1426: @AfterMethod(alwaysRun = true) is not getting called if we have exception in @BeforeMethod (@dipak-pawar)
+Fixed: GITHUB-128: Using Object[] and Method as parameters for a test in a certain order yields an IllegalArgumentException, citing a type mismatch (@leef590 & Julien Herr,Krishnan Mahadevan)
+Fixed: GITHUB-1393: Revert commit 50d534a to allow fail a test from onTestStart method
+Fixed: GITHUB-1461: TestNG not getting garbage collected (@kiru)
+
+6.11
+2017/02/27
+Fixed: GITHUB-1351: FailurePolicy failing with YAML (Steven Zaluk & Julien Herr)
+New: The name of all TestNG threads follow "TestNG-<thread type>-<number>" pattern (Julien Herr)
+Fixed: GITHUB-1339: Alter ClassHelper to use Maps instead of Lists for extracting methods (Krishnan Mahadevan)
+Fixed: GITHUB-1338: @BeforeGroups method is run on a wrong instance (Pavel Vetokhin & Julien Herr)
+Fixed: GITHUB-1332: Make EmailableReport name configurable (Krishnan Mahadevan)
+Fixed: GITHUB-1297: testng-failed.xml includes setup and tearDown (before and after annotations) of passed tests
+(Krishnan Mahadevan)
+Fixed: GITHUB-1319: ITestResult#getInstance() returns null in IConfigurationListener implementation (Krishnan Mahadevan)
+New: Skipped methods are not supposed to be executed (Julien Herr)
+Fixed: GITHUB-1197: Ability to dynamically set the status and exception of a test via ITestResult (Anthony Nguyen)
+Fixed: GITHUB-1302: When 'parallel' is set to 'classes', ConcurrentModificationException can be thrown(Jianhua Li)
+Fixed: GITHUB-772: Severe thread contention while running large test with parallel methods (Shaburov Oleg)
+Fixed: GITHUB-1307: TestNGException when using an anonymous class in Factory (Mike Cowan)
+Fixed: GITHUB-1298: ITestResult injection is failing in BeforeMethod method (Krishnan Mahadevan)
+Fixed: GITHUB-1293: Beanshell based execution does not work any more (Krishnan Mahadevan)
+Fixed: GITHUB-1262: Testcases out of order in XML file in junitreport folder when using testng (Krishnan Mahadevan)
+Fixed: GITHUB-116 : BaseTestMethod does respect general contract of Comparable (Testo Nakada)
+Fixed: GITHUB-1265: JUnit Reporter includes redundant ignored methods (Krishnan Mahadevan)
+Fixed: GITHUB-1266: JUnit Reporter produces a wrong number of total test methods (Krishnan Mahadevan)
+Fixed: GITHUB-1257: Group parameter not applying on included <suite-files>
+Fixed: GITHUB-1284: Listeners on the child suites are not applied (Vimalraj Selvam)
+New: GITHUB-1313: Add Java9 as test environment on Travis (Julien Herr)
+Fixed: GITHUB-1296: Configuration listeners run multiple times (@mikimrozowski & Julien Herr)
+Fixed: GITHUB-1300: Add deep assertions to assert on array values (array reference by default) (Jordan Zimmerman & Julien Herr)
+
+6.10
+2016/11/28
+Fixed: GITHUB-551: Failed configuration method always has 0 execution time (dr29bart)
+Fixed: GITHUB-1250: Testng-failed.xml is getting test level parameters into suite level parameters (Krishnan Mahadevan)
+Fixed: GITHUB-1046: Provide a mechanism to customize a test method name for reporting (Krishnan Mahadevan)
+Fixed: GITHUB-1211: Include disabled/ ignored test methods in JUnit reports (Krishnan Mahadevan)
+Fixed: GITHUB-1213: Include "ignored" test count in testng-results.xml (Krishnan Mahadevan)
+Fixed: GITHUB-674: Enrich Test method skips due to configuration failures with throwable data (Krishnan Mahadevan)
+Fixed: GITHUB-1240: Enrich the test results showing mechanism in Travis CI (Krishnan Mahadevan)
+Fixed: GITHUB-1232: Prevent TestNG from adding duplicate instances of the same listener (Krishnan Mahadevan)
+Fixed: GITHUB-1170: Fixing the test DataProviderTest.shouldNotThrowConcurrentModification (Krishnan Mahadevan)
+Fixed: GITHUB-1231: Make IExecutionListener implementation be the last reporter call before JVM exit(Krishnan Mahadevan)
+Fixed: GITHUB-1227: Prevent multiple instances of same Reporter from being injected into TestNG (Krishnan Mahadevan)
+Fixed: GITHUB-1165: Better message to user when param injection is not good (Krishnan Mahadevan)
+Fixed: GITHUB-1228: Control stacktrace levels in XmlReports via a JVM configuration (Krishnan Mahadevan)
+Fixed: GITHUB-1203: Add flush to BufferedWriter; fixes incomplete XML reports (Nathan Bruning)
+Fixed: GITHUB-1181: Fix MethodMatcherException: Data provider mismatch (Krishnan Mahadevan)
+Fixed: GITHUB-1107: TestNG does not report/print/log throwables in data providers (Krishnan Mahadevan)
+Fixed: GITHUB-1186: NullPointerException in JUnit reporter when used with Spock (Ian Robertson & Julien Herr)
+Fixed: GITHUB-1180: NullPointerException on getting excluded/included groups (Krishnan Mahadevan)
+Fixed: GITHUB-1064: Incorrect logging of parallel mode of a test
+Fixed: GITHUB-1178: Halt execution when invalid testname is provided. (Krishnan Mahadevan)
+Fixed: GITHUB-1139: DataProvider could support Object[] as a valid return type (Julien Herr)
+Fixed: GITHUB-1182: Cannot run multiple @Factory-annotated methods in the same class (Ian Donovan & Julien Herr)
+New: Hierarchy on order features (from less important to more important): groupByInstance, preserveOrder, priority, dependsOnGroups, dependsOnMethods
+Fixed: GITHUB-1156: test execution dependant upon class name order and fails with TestNGException: No free nodes found (@t-weil & Julien Herr)
+Fixed: GITHUB-1221: ConcurrentModificationException in TextReporter (Nick Tan)
+Fixed: testng-eclipse/issues/298: IConfigurationListener was not loaded when running Test in Eclipse Plugin (@jmcgrail & Nick Tan)
+New: Resources for test reports (header, images) now live in a sub directory org/testng to remove conflicts with other similar files in the class loader.
+
+6.9.13.6
+2016/09/23
+
+6.9.13.5 (Bad release)
+2016/09/23
+
+6.9.13.4 (Bad release: Wrong internal version)
+2016/09/22
+
+6.9.13.3 (Ok, but too many direct dependencies)
+2016/09/22
+
+6.9.13.2 (Bad release: Wrong internal version)
+2016/09/20
+
+6.9.13.1 (Bad release: fat jar)
+2016/09/19
+
+6.9.13 (Bad release: JDK8 target only)
+2016/09/16
+
+New: code improvement in order to calculate key for dependency map. Dependency map will use methodQualifiedName as key provided by ITestNGMethod (Chirag Jayswal)
+Fixed: GITHUB-1105: Test skipped instead failed if incorrect enum value (Liza Ivanova & Julien Herr)
+Fixed: GITHUB-1111: XMLReporter crashes if a test parameter is exactly "]]>" (Łukasz Rekucki & Julien Herr)
+Fixed: GITHUB-1108 @BeforeGroups called twice (Krishnan Mahadevan)
+Fixed: GITHUB-1112 XmlInclude.getDescription returns null always (Krishnan Mahadevan)
+Fixed: GITHUB-1090 Inconsistent handling "preserve-order" on suite/test level (Michal Domagala & Julien Herr)
+Fixed: GITHUB-1085 Remove Guava dependency (Erik C. Thauvin & Julien Herr)
+Fixed: GITHUB-1084 Using deprecated addListener methods should not register many times (Anna Kozlova & Julien Herr)
+Fixed: GITHUB-447 Copy test parameters instead of storing a reference (Huagang Li & Julien Herr)
+Fixed: GITHUB-174: NPE when parsing xml where <suite> has <groups> (Peter Stout & Julien Herr)
+Fixed: GITHUB-918: NullPointerException on loading XmlSuites programmatically (@ispitkovskyi & Julien Herr)
+Fixed: GITHUB-689: <groups> at <suite> level not applied to <suite-files> (@kunal546 & Julien Herr)
+Fixed: GITHUB-740: More than one execution even when success with DataProvider and IRetryAnalyzer (Sergio Sacristán)
+Fixed: GITHUB-877: Retries don't work correctly with DataProvider tests (Simonas Tvirbutas)
+Fixed: GITHUB-1103: Add ...junit.ArrayAsserts.assertArrayEquals(boolean[], boolean[]) (Jonathan Halterman & Julien Herr)
+Fixed: GITHUB-1122: Use the default value for preserve-order (Guillaume Guillot & Julien Herr)
+Fixed: GITHUB-1022: Non static methods from external data providers are not working without @Guice (Sourav Chandra & Julien Herr)
+Fixed: GITHUB-1130: IClassListener should only be instantiated once (Guillaume Guillot & Julien Herr)
+Fixed: GITHUB-1131: IObjectFactory not being called for factory test instances with constructor-injected data provider (Scott McClure & Julien Herr)
+New: GITHUB-1083: Factory supports indices (Julien Herr)
+Fixed: GITHUB-148: 'Run Failed Test' doesn't run the proper tests after 2nd rerun when DataProvider is used (@akracheva & Julien Herr)
+
+6.9.12
+2016/06/21
+
 Fixed: GITHUB-1017 Reporter.log is ignored in skipped test listener (Scott Kirkpatrick)
 New: Minimal code changes to allow TestNG to work for OpenJDK tests, which should be run with only the java.base module present.
 Fixed: GITHUB-1047 IClassListener didn't work (Julien Herr)
@@ -153,9 +614,9 @@ Added: Allow injection of java.lang.reflect.Constructor and org.testng.ITestNGMe
 Fixed: Assertions in the Assertions class were not failing properly.
 Fixed: GITHUB-337: ConfigurationMethod#m_instance set to Boolean.FALSE due to incorrect constructor call in clone() + auto-boxing (davidely)
 Fixed: Fix NPE for dependency methods/groups (Krishnan Mahadevan)
-Fixed: preserve-order bug (found by VladSarrokhin). 
+Fixed: preserve-order bug (found by VladSarrokhin).
 Fixed: GITHUB-300: OutOfMemoryException from reporters when there are a lot of tests
-Fixed: GITHUB-137: Main parameters with a default value should be overridden if a main parameter is specified 
+Fixed: GITHUB-137: Main parameters with a default value should be overridden if a main parameter is specified
 Fixed: GITHUB-107: Allow enum values without converting them to uppercase.
 Fixed: @Guice with no modules specified is now supported
 Fixed: Reporter.log() invoked from listeners were being discarded
@@ -172,7 +633,7 @@ Added: Big performance improvement when generating the reports (Frank Pavageau)
 Added: <dependencies> allows you to specify group dependencies in testng.xml
 Added: Blow up early if trying to include/exclude an unknown method
 Added: <parameters> can now be specified under <include> (Storm Qi)
-Added: GITHUB-243: Add Reporter Output per Test in XMLReporter (dunse) 
+Added: GITHUB-243: Add Reporter Output per Test in XMLReporter (dunse)
 Fixed: Better HTML escaping of the stack traces
 Fixed: The failed assertions now use [] as delimiters instead of <> (better for the HTML reports)
 Fixed: GITHUB-237: Wrong time format in XML reporter
@@ -357,7 +818,7 @@ Eclipse:
 Added: New quick fix "Add static import org.testng.AssertJUnit.assertXXX"
 Added: New workspace wide setting: excluded stack traces, to provide shorter stack traces in the view
 Added: New "Clear results" icon in the tool bar
-Added: When the search filter is modified, don't update the tree live if it is too big 
+Added: When the search filter is modified, don't update the tree live if it is too big
 Added: Two new @Test refactorings (pull to class level, push to method level)
 Added: JUnit conversion: @Ignore
 Added: JUnit conversion: assertArrayEquals()
@@ -501,10 +962,10 @@ Added: -testnames (command line) and testnames (ant)
 Added: New ant task tag:  propertyset (Todd Wells)
 Added: ITestNGListenerFactory
 Added: Passing command line properties via the ant task and doc update (Todd Wells)
-Added: Hierarchical XmlSuites (Nalin Makar) 
+Added: Hierarchical XmlSuites (Nalin Makar)
 Added: Reporter#clear()
 Fixed: NullPointerException when a suite produces no results (Cefn Hoile)
-Fixed: Identical configuration methods were not always invoked in the correct order in superclasses (Nalin Makar) 
+Fixed: Identical configuration methods were not always invoked in the correct order in superclasses (Nalin Makar)
 Fixed: @DataProvider(parallel = true) was passing incorrect parameters with injection
 Fixed: Replaced @Test(sequential) with @Test(singleThreaded)
 Fixed: If inherited configuration methods had defined deps, they could be invoked in incorrect order (Nalin Makar)
@@ -521,9 +982,9 @@ Fixed: Issue78 NPE with non-public class. Now throws TestNG exception
 Fixed: NPE with @Optional null parameters (Yves Dessertine)
 Fixed: TESTNG-387 TestNG not rerunning test method with the right data set from Data Provider (Francois Reynaud)
 Fixed: Show correct number of pass/failed numbers for tests using @DataProvider
-Fixed: Return correct method status and exception (if any) in InvokedMethodListener.afterInvocation() 
-Fixed: Trivial fixes: TESTNG-241 (log message at Info), Issue2 (throw SAXException and not NPE for invalid testng xml) 
-Fixed: Configuration methods couldn't depend on an abstract method (Nalin Makar) 
+Fixed: Return correct method status and exception (if any) in InvokedMethodListener.afterInvocation()
+Fixed: Trivial fixes: TESTNG-241 (log message at Info), Issue2 (throw SAXException and not NPE for invalid testng xml)
+Fixed: Configuration methods couldn't depend on an abstract method (Nalin Makar)
 Fixed: TestNG#setTestClasses was not resetting m_suites
 Fixed: Exceptions thrown by IInvokedMethodListeners were not caught (Nalin Makar)
 Fixed: @Listeners now works on base classes as well
@@ -567,7 +1028,7 @@ Eclipse:
 Added: New file wizard: can now create a class with annotations, including @DataProvider
 Added: You can now select multiple XML suites to be run in the launch dialog
 Fixed: @Test(groups = <constant>) was taking name of the constant instead of its value.
-Fixed: http://jira.codehaus.org/browse/GRECLIPSE-476 NPE with Groovy Tests (Andrew Eisenberg)
+Fixed: https://jira.codehaus.org/browse/GRECLIPSE-476 NPE with Groovy Tests (Andrew Eisenberg)
 Fixed: The custom XML file is now created in the temp directory instead of inside the project
 Fixed: In the launch dialog, now display an error if trying to pick groups when no project is selected
 Fixed: Was not setting the parallel attribute correctly on the temporary XML file
@@ -638,8 +1099,8 @@ Fixed: Quick fixes no longer introduce deprecated annotations (Greg Turnquist)
 5.9
 2009/04/09
 
-Added: New ant task boolean flag: delegateCommandSystemProperties (Justin) 
-Added: skipfailedinvocations under <suite> in testng-1.0.dtd (Gael Marziou / Stevo Slavic) 
+Added: New ant task boolean flag: delegateCommandSystemProperties (Justin)
+Added: skipfailedinvocations under <suite> in testng-1.0.dtd (Gael Marziou / Stevo Slavic)
 Added: -testrunfactory on the command line and in the ant task (Vitalyi Pamajonkov)
 Added: TESTNG-298: parallel="classes", which allows entire classes to be run in the same thread
 Added: @BeforeMethod can now declare Object[] as a parameter, which will be filled by the parameters of the test method
@@ -732,10 +1193,10 @@ Added: ISuite now gives access to the current XmlSuite
 Fixed: TESTNG-139 dependsOnMethods gets confused when dependency is "protected"
 Fixed: TESTNG-141 junit attribute set to false in testng-failed.xml when it should be true
 Fixed: TESTNG-142 Exceptions in DataProvider are not reported as failed test
-Added: Improved behavior for @Before/@AfterClass when using @Factory 
-(http://forums.opensymphony.com/thread.jspa?threadID=6594&messageID=122294#122294)
+Added: Improved behavior for @Before/@AfterClass when using @Factory
+(https://forums.opensymphony.com/thread.jspa?threadID=6594&messageID=122294#122294)
 Added: Support for concurrent execution for invocationCount=1 threadPoolSize>1 and @DataProvider
-(http://forums.opensymphony.com/thread.jspa?threadID=64738&tstart=0)
+(https://forums.opensymphony.com/thread.jspa?threadID=64738&tstart=0)
 Added: New TestNG specific XML report, generated by default in 'xml' subdirectory of test-output
 Added: support in strprotocol for passing the ITest.getTestName() information
 Fixed: TESTNG-152 If DataProvider is not found, the exception message should tell exactly what happened
@@ -768,7 +1229,7 @@ Added: Method selectors receive a Context and can stop the chain with setStopped
 Fixed: XmlMethodSelector was always run first regardless of its priority
 Added: @BeforeGroups/@AfterGroups can live in classes without @Test methods
 Added: DataProvider can now take an ITestContext parameter
-Fixed: Wasn't parsing <selector-class-name> correctly 
+Fixed: Wasn't parsing <selector-class-name> correctly
 Fixed: Annotation Transformers now work on class-level annotations
 Fixed: Some class-level @Test attributes were not always honored
 Added: Clean separation between @Test invocation events and @Configuration invocation events
@@ -805,7 +1266,7 @@ Eclipse plug-in
 Fixed: groups with multi-attribute javadoc annotations
 Fixed: consistent behavior for dependsOnMethods
 Fixed: consistent behavior for tests with dependsOnGroups (a warning is emitted)
-Fixed: consistent merge of configuration arguments when an existing launch configuration exists 
+Fixed: consistent merge of configuration arguments when an existing launch configuration exists
 ===========================================================================
 5.3
 2006/10/30
@@ -855,7 +1316,7 @@ Fixed: Throw proper exception when a DataProvider declares parameters
 Added: completely revamped JUnit support (should run all kind of JUnit tests)
 Fixed: TESTNG-40 (Bug in testng-failed.xml generation)
 Fixed: TESTNG-106 (Failed "@BeforeSuite" method just skipps the last test in xml-file)
-Fixed: Success on 0 tests (http://forums.opensymphony.com/thread.jspa?threadID=41213)
+Fixed: Success on 0 tests (https://forums.opensymphony.com/thread.jspa?threadID=41213)
 
 Eclipse plug-in
 Added: TESTNG-105 Automaticaly define TESTNG_HOME classpath variable
@@ -867,7 +1328,7 @@ Added: TESTNG-105 Automaticaly define TESTNG_HOME classpath variable
 Added: @Test(sequential = true)
 Fixed: TESTNG-102 (Incorrect ordering of @BeforeMethod calls when a dependency is specified)
 Fixed: TESTNG-101 (HTML output contains nested <P> tags and a missing <tr> tag)
-Added: support for specifying test-only classpath (http://forums.opensymphony.com/thread.jspa?messageID=78048&tstart=0)
+Added: support for specifying test-only classpath (https://forums.opensymphony.com/thread.jspa?messageID=78048&tstart=0)
 Fixed: TESTNG-93 (method selectors filtering @BeforeMethod)
 Fixed: TESTNG-81 (Assert.assertFalse() displays wrong expected, actual value)
 Fixed: TESTNG-59 (multiple method selectors usage results in no tests run)
@@ -909,7 +1370,7 @@ Added: Can now specify listener classes
 5.0.1
 
 Fixed: reports generated by SuiteHTMLReporter do not work with JDK1.4
-			 
+
 ===========================================================================
 
 5.0
@@ -921,9 +1382,9 @@ Added: Link to testng.xml in the reports
 Added: New structure for reports, suites go in their individual directory
 Added: @Test(suiteName) and @Test(testName)
 Added: The stack traces in reports do not include TestNG frames (system property testng.exception)
-			 (see: http://groups.google.com/group/testng-dev/browse_thread/thread/9f4d46ade10b0fda)
+			 (see: https://groups.google.com/group/testng-dev/browse_thread/thread/9f4d46ade10b0fda)
 Fixed: Exit with error when no methods are run
-			 (see: http://groups.google.com/group/testng-dev/browse_thread/thread/3c26e8a5658f22ac)
+			 (see: https://groups.google.com/group/testng-dev/browse_thread/thread/3c26e8a5658f22ac)
 Added: List of methods in alphabetical order
 Fixed: Class-scoped annotations were not recognized when inherited
 Added: Deprecated @Configuration and introduced @BeforeSuite/Test/Class/TestMethod
@@ -951,14 +1412,14 @@ Added: if patch-testng-sourcedir.properties is found in the classpath
 Added: Maven 2 plug-in
 Fixed: Message formattings in TestNG assertion utility class
 Fixed: @Factory methods were counted as @Test as well
-       http://jira.opensymphony.com/browse/TESTNG-51
+       https://jira.opensymphony.com/browse/TESTNG-51
 Fixed: All DataProvider parameters were shown in the HTML report
 Fixed: Bug in testng-failed.xml generation
 Fixed: <packages> bug when using a jar file to load the test classes
 Added: alwaysRun for before @Configuration methods
-       http://jira.opensymphony.com/browse/TESTNG-35
+       https://jira.opensymphony.com/browse/TESTNG-35
 Fixed: groupless @Configurations were not invoked if a method depends on a group
-       http://jira.opensymphony.com/browse/TESTNG-45
+       https://jira.opensymphony.com/browse/TESTNG-45
 Added: beforeGroups/afterGroups to @Configuration
 
 Eclipse plugin:
@@ -994,8 +1455,8 @@ Fixed: TESTNG-24: 'Run as testng test' does not appear of the Test annotation do
 Fixed: TESTNG-18: Eclipse plugin ignores Factory annotation
 Fixed: TESTNG-21: Show differences when double clicking assertion exceptions
 Added: UI allows setting orientation (even more space)
-	   http://forums.opensymphony.com/thread.jspa?threadID=17225&messageID=33805#33805
-	   
+	   https://forums.opensymphony.com/thread.jspa?threadID=17225&messageID=33805#33805
+
 ===========================================================================
 
 4.5
@@ -1098,8 +1559,8 @@ Fixed: dependsOnGroups wasn't working on regular expressions
 Fixed: Bug in <package> when directories contain spaces in their names
 Fixed: Introduced a JDK5 dependency in the JDK1.4 build (getEnclosingClass())
 Fixed: Output directory in ant task was not honored if it didn't exist
-Fixed: Problem with timeout according to 
-       http://forums.opensymphony.com/thread.jspa?threadID=6707
+Fixed: Problem with timeout according to
+       https://forums.opensymphony.com/thread.jspa?threadID=6707
 
 Eclipse plug-in:
 
@@ -1108,7 +1569,7 @@ Fixed: Bug in QuickFix implementation
 Added: Quick Fix for JUnit conversion (Annotations and JavaDoc)
 Fixed: Methods Run as TestNG test
 Added: Package level Run as TestNG test
-Fixed: Resources from the linked directories are using a wrong path when 
+Fixed: Resources from the linked directories are using a wrong path when
        passed to command line TestNG
 
 IDEA plug-in:
@@ -1173,7 +1634,7 @@ Fixed: TestNGException thrown when TestNG conditions are not fulfilled
 
 Documentation:
 - New assert classes
-- New ways to launch 
+- New ways to launch
 - JUnitConverter documentation
 - new beforeSuite/afterSuite
 
@@ -1255,7 +1716,7 @@ Added: <fileset> to <testng>
 
 1.0
 2004/04/28
-http://beust.com/weblog/2004/04/28/
+https://beust.com/weblog/2004/04/28/
 
 Fixed: Updated to the new DTD
 Fixed: Suite table of contents displays failures first
diff --git a/CHECKLIST b/CHECKLIST
deleted file mode 100644
index e9488f1..0000000
--- a/CHECKLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-Check list for releases:
-
-pom.xml
-pom-test.xml
-Version.java
-build.properties
-
-doc/index.html
-doc/documentation-main.html
-doc/maven.html
diff --git a/FILES b/FILES
deleted file mode 100644
index 482af74..0000000
--- a/FILES
+++ /dev/null
@@ -1,11 +0,0 @@
-build.properties
-build.xml
-lib/DTDDoc.jar
-examples/build.xml
-examples/testng.properties
-examples/testng.xml
-examples/src/
-maven-testng-plugin-1.1.jar
-CHANGES.txt
-LICENSE.txt
-README
diff --git a/LICENSE.txt b/LICENSE.txt
index 261eeb9..20e4bd8 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/NOTES b/NOTES
deleted file mode 100644
index 07c2aa1..0000000
--- a/NOTES
+++ /dev/null
@@ -1,38 +0,0 @@
-=====
-Maven
-=====
-
-If you ran the full dist build, it should have generated a file on your hard drive called
-"testng-5.12-bundle.jar".
-
-Testing:
-
--> Update <version>5.12</version> in bundle-pom.xml to the correct version
-  mvn install:install-file -DpomFile=bundle-pom.xml -Dfile=testng-5.12.1.jar
-  cd /tmp
-  svn co http://svn.apache.org/repos/asf/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-simple/
-  cd testng-simple
--> Update <testNgVersion> in pom.xml to the correct version
--> Remove <classifier> in pom.xml if it's still there
-  mvn -DtestNgVersion=5.12.1 -Dsurefire.version=2.5 clean test
--> Send bundle to Brett Porter <[e-mail]>
-
-=======
-Eclipse
-=======
-
-I ended up doing the launch configuration, and just for information, here are the parameters:
-
-Run Configuration / Eclipse application.
-
-Check "Run an application" in "Program to run", and select org.eclipse.equinox.p2.metadata.generator.EclipseGenerator
-
-The program arguments are (replace the update site directory appropriately):
-
-Linux:
--os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}    -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator -updateSite /usr/local/cbeust/java/testng-eclipse-update-site -site file:/usr/local/cbeust/java/testng-eclipse-update-site/site.xml  -metadataRepository file:/usr/local/cbeust/java/testng-eclipse-update-site/  -artifactRepository file:/usr/local/cbeust/java/testng-eclipse-update-site -artifactRepositoryName "Ganymede Artifacts" -compress  -append  -reusePack200Files  -noDefaultIUs  -vmargs -Xmx256m
-
-Mac
--os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}    -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator -updateSite /Users/cbeust/java/testng-eclipse-update-site -site file:/Users/cbeust/java/testng-eclipse-update-site/site.xml  -metadataRepository file:/Users/cbeust/java/testng-eclipse-update-site/  -artifactRepository file:/Users/cbeust/java/testng-eclipse-update-site -artifactRepositoryName "Ganymede Artifacts" -compress  -append  -reusePack200Files  -noDefaultIUs  -vmargs -Xmx256m
-
-This will generate the site in ~/java/testng-eclipse-update-site
diff --git a/README b/README
deleted file mode 100644
index ae34ca2..0000000
--- a/README
+++ /dev/null
@@ -1,12 +0,0 @@
-[![Build Status](https://travis-ci.org/cbeust/testng.svg)](https://travis-ci.org/cbeust/testng)
-
-Welcome to TestNG 6.8beta
-
-Please note that even though the .zip distribution contains the TestNG sources,
-you will not be able to build the software with them because we decided
-not to include the external jar files in order to keep the size down.
-
-If you want to build TestNG, please sync to the GitHub repository at https://github.com/cbeust/testng.
-
---
-The TestNG team
diff --git a/README-publish b/README-publish
deleted file mode 100644
index 621ed43..0000000
--- a/README-publish
+++ /dev/null
@@ -1,9 +0,0 @@
-To publish:
-
-- ./gradlew bintrayUpload will upload the release to JCenter. It will fail if the version is a SNAPSHOT
-- ./gradlew uploadArchives will upload
-  - the snapshot to https://oss.sonatype.org/content/repositories/snapshots
-  - the release to https://oss.sonatype.org/service/local/staging/deploy/maven2
-For a release, you then need to go to https://oss.sonatype.org/index.html#stagingRepositories to manually close and release the distribution.
-
-Note that `./gradlew uploadArchives` is run by Travis after each new push to deploy the latest HEAD to the snapshot directory. As such, the version number of `build.gradle` in the git repo should always be -SNAPSHOT.
diff --git a/README.build b/README.build
deleted file mode 100644
index 8b10e0d..0000000
--- a/README.build
+++ /dev/null
@@ -1,7 +0,0 @@
-You need to install ivy in order to build.
-
-You can either download it from the ivy site or more simply,
-copy ivy-2.1.0.jar included in the root directory to ~/.ant/lib.
-
-After this, "ant" will build the distribution and run the tests.
-
diff --git a/README.dev b/README.dev
deleted file mode 100644
index c74f7e5..0000000
--- a/README.dev
+++ /dev/null
@@ -1,36 +0,0 @@
-New installation:
-
-Install GPG at http://www.gpgtools.org/gpgmail/index.html
-Generate new key with gpg --gen-key
-build-with-maven
-gpg --list-keys
-Send the public key:
-  gpg --keyserver hkp://pool.sks-keyservers.net --send-keys <public_key>
-  or wwwkeys.at.pgp.net
-
-
-  instructions at https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven
-
-
-Configure ~/.m2/settings.xml with Nexus user/password:
-
-  <settings>
-    <servers>
-      <server>
-        <id>sonatype-nexus-snapshots</id>
-        <username>***</username>
-        <password>***</password>
-      </server>
-      <server>
-        <id>sonatype-nexus-staging</id>
-        <username>***</username>
-        <password>***</password>
-      </server>
-    </servers>
-  </settings>
-
-Snaphot deploy:
-mvn -Dgpg.passphrase= -Dgpg.keyname=<public_key> deploy
-
-Staging deploy:
-mvn -Dgpg.passphrase= -Dgpg.keyname=<public_key> release:clean release:prepare release:perform
diff --git a/README.md b/README.md
index 53879e4..1168afb 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,49 @@
-[![Build Status](http://img.shields.io/travis/cbeust/testng.svg)](https://travis-ci.org/cbeust/testng)
-[![Java9 EA Build Status](https://img.shields.io/jenkins/s/https/adopt-openjdk.ci.cloudbees.com/TestNG.svg?label="Java9 EA")](https://adopt-openjdk.ci.cloudbees.com/job/TestNG)
-[![Java9 Jigsaw EA Build Status](https://img.shields.io/jenkins/s/https/adopt-openjdk.ci.cloudbees.com/TestNG-Jigsaw.svg?label="Java9 Jigsaw")](https://adopt-openjdk.ci.cloudbees.com/job/TestNG-Jigsaw)
-[![AppVeyor](https://ci.appveyor.com/api/projects/status/github/cbeust/testng?svg=true)](https://ci.appveyor.com/project/cbeust/testng)
-[![Dependency Status](https://www.versioneye.com/user/projects/553a031c4e5d2e9408000059/badge.svg)](https://www.versioneye.com/user/projects/553a031c4e5d2e9408000059)
-[![Reference Status](https://www.versioneye.com/java/org.testng:testng/reference_badge.svg)](https://www.versioneye.com/java/org.testng:testng/references)
 [![Maven Central](https://img.shields.io/maven-central/v/org.testng/testng.svg)](https://maven-badges.herokuapp.com/maven-central/org.testng/testng)
 [![License](https://img.shields.io/github/license/cbeust/testng.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
-[![Sonarqube tech debt](https://img.shields.io/sonar/http/nemo.sonarqube.org/org.testng:testng/tech_debt.svg?label=Sonarqube%20tech%20debt)](http://nemo.sonarqube.org/dashboard/index?id=org.testng:testng)
+[![Sonarqube tech debt](https://img.shields.io/sonar/https/sonarqube.com/org.testng:testng/tech_debt.svg?label=Sonarqube%20tech%20debt)](https://sonarqube.com/dashboard/index?id=org.testng:testng)
+[![Sonarqube Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.testng%3Atestng&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.testng%3Atestng)
 
-Documentation available at [TestNG's main web site](http://testng.org).
+Documentation available at [TestNG's main web site](https://testng.org).
+
+### Release Notes
+
+* [7.4.0](https://groups.google.com/g/testng-users/c/dwSJ04qeu8k)
+* [7.3.0](https://groups.google.com/forum/#!topic/testng-users/a81uaZvtEZI)
+* [7.1.0](https://groups.google.com/forum/#!topic/testng-users/84bYPJ1rjno)
+* [7.0.0](https://groups.google.com/forum/#!topic/testng-users/HKujuefBhXA)
+
+### Need help?
+Before opening a new issue, did you ask your question on
+* [Google group](https://groups.google.com/group/testng-users)
+* [StackOverflow](https://stackoverflow.com/questions/tagged/testng)
+
+If you posted on both sites, please provide the link to the other question to avoid duplicating the answer.
+
+### Are you sure it is a TestNG bug?
+Before posting the issue, try to reproduce the issue in [a shell window](https://testng.org/doc/documentation-main.html#running-testng).
+
+If the problem does not exist with the shell, first check if the issue exists on the bugtracker of the runner, and open an issue there first:
+* Eclipse: https://github.com/cbeust/testng-eclipse/issues
+* IntelliJ: [https://youtrack.jetbrains.com/issues](https://youtrack.jetbrains.com/issues?q=Subsystem:%20%7BJava.%20Tests.%20TestNG%7D)
+* Maven: https://issues.apache.org/jira/browse/SUREFIRE
+* Gradle: https://issues.gradle.org/projects/GRADLE
+
+### Which version are you using?
+Always make sure your issue is happening on the latest TestNG version. Bug reports occurring on older versions will not be looked at quickly.
+
+### Have you considered sending a pull request instead of filing an issue?
+The best way to report a bug is to provide the TestNG team with a full test case reproducing the issue.
+Maybe you can write a runnable test case (check the `src/test/` folder for examples) and propose it in a pull request 
+Don't worry if the CI fails because it is the expected behavior.
+This pull request will be a perfect start to find the fix :)
+
+### How to create a pull request?
+Refer our [Contributing](.github/CONTRIBUTING.md) section for detailed set of steps.
+
+### We encourage pull requests that:
+
+  * Add new features to TestNG (or)
+  * Fix bugs in TestNG
+
+  If your pull request involves fixing SonarQube issues then we would suggest that you please discuss this with the 
+  [TestNG-dev](https://groups.google.com/forum/#!forum/testng-dev) before you spend time working on it.
diff --git a/TESTNG-5.11beta b/TESTNG-5.11beta
deleted file mode 100644
index e69de29..0000000
--- a/TESTNG-5.11beta
+++ /dev/null
diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index 1013ce5..0000000
--- a/TODO.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-                                       TODO for TestNG
-
-* Pass the XmlTest in @Before/@After methods
-* Allow a testng.xml file to be passed when -testjar is used
-* Add onStart to IConfigurationListener (create a new interface, actually)
-* Add timeout to @Before/@After
-* Pass parameters from ant
-* Make it possible to specify groups on command line and classes in testng.xml
-(and any combinations thereof:  command line, ant, testng.xml)
-* DataProvider index in testng.xml
-* Create a servlet for remote driving
-* Add time-outs at the testng.xml.  Also:  test and suite time-outs? http://tinyurl.com/kbwxq
-* Add working dir to the ant task
-* Add a servlet so TestNG can be invoked from a web browser
-* Make it possible to add listeners from the Eclipse plug-in
-
-Doc:
-
-* Document the fact that @Test methods with return values are ignored.
-
-===========================================================================
-Older TODO's:
-
-* Show enabled=false methods in the reports, as well as methods
-in groups that were not run
-* Multi-threading for invocationCount and maybe for <test> too
-* Annotation to specify that a method should be called concurrently by n threads 
-(on second thought, we should do that for an entire group)
-* more thread ideas: http://www.theserverside.com/news/thread.tss?thread_id=38922
-* package support for command line and ant
-* Parameters for classes (to be passed as parameters to constructors)
-* testng-dist.zip should contain a top-level directory
-* For dependent methods, if the user is trying to run an incomplete graph
-(A depends on B but B is being excluded from the run), what to do?  Ignore
-the exclusion on B and run it anyway, or abort with an exception explaining
-what's happening?)
-* Make timeOut() work with milliseconds (but keep seconds for backward
-compatibility)
-* Improve the plug-in API so people can add listeners without having to
-modify TestRunner
-* Use factories for the programmatic API.
-* Add dynamic generation of tests
-* Make Javadoc comments over methods appear in the final report
-
-Documentation:
-* IHookable
-* List<IReporter>
-
-
-DONE
-
-* Retry patch
-* If a method with invocationCount fails, don't run the others
-* Allow multiple listeners in ant task
-* Add working dir to the ant task
-* Introduce "test" and "suite" parameters to @Test at the class level to
-avoid having to use testng.xml
-* Remove TestNG stack traces from the report
-* When 0 tests were run, exit with an error http://tinyurl.com/ftng6
-* Show all the extra output for all methods in a single 
-dedicated page
-* report API
-* Show parameters used to invoke a specific test
-* show skipped groups/methods in HTML report
-* beforeTestGroups
-* <testng classfileset> doesn't add to classpath
-* threadPoolSize
-* Parameter logging
-* JavaDoc for org.testng.TestNG
-* org.testng.Reporter in the HTML report (screenshot ready)
-* Document @Parameters only works for @Test (should mention @Factory and @Configuration)
-* Document: <testng classfileset> doesn't add to classpath
-* Document org.testng.Reporter in the HTML report (screenshot ready)
-* Document parameter logging
-* JavaDoc for org.testng.TestNG
-* Document threadPoolSize
-* Make sure it can run several times in the same JVM
-* Implement invocationCount and successPercentage
-* Support multiple testng.xml (TestNG allows it but not the reporters
-yet)
-* The HTML reporter collapses all the suites into one report, we should
-create one HTML report per suite
-* testng-failed.xml should contain the parameters of testng.xml (if any)
-* Create a testng-failed.xml that includes dependent methods
-* Generic reported with compare(ITestResult, ITestResult) for
-easier reporter for "slowest method first" or generate testng-failed.xml
-* Iterator factories
-* configuration methods don't respect inheritance
-- build.xml should issue a clear error message if trying to build with JDK1.4
-- Implement <tasdkdef resource="testnganttasks"> so we can define
-ant tasks for TestNG and JUnitConverter automatically
-- Write documentation to declare ant task in section 3.2.8
-- Documentation for alwaysRun
-- Allow to specify packages or prefix in the <classes> tag:
-   <classes prefix="com.beust.testng"><class name="A"><class name="B"> />
-- New assert classes
-- New ways to launch 
-- JUnitConverter documentation
-- new beforeSuite/afterSuite
-
-* in testng-failures.xml include the beforeSuite/afterSuite methods (very tricky)
-* Provide log.properties configuration (not using log any more)
-* Make @ExpectedExceptions fail if no exception is thrown
-* Make timeOut() work in non-parallel mode (the default mode needs to become
-parallel=true thread-count=1
-* The exception thrown when a test passes with a @ExpectedExceptions is not 
-available via the TestNG API: ITestResult.getThrowable().
-* Add assert API for arrays and collections (undecided yet:  partial asserting)
-* dependsOnMethods
-Allow to specify <groups> at the <suite> level
-Make TestNG run on class files and not just on testng.xml
-Make TestNG run on a jar file that has a testng.xml file in its root or just on all
-  the classes inside that jar file.
-
-Implement parameter passing of tests:  define a property in the properties
-file and pass it to the test method:
-
-@Test(params = { "${fn}", "${ln}" }
-public void testNames(String firstName, String lastName) {
-}
-
-Run groups of groups
-List all tests that will be run, or show methods per group
-HTML generation
-Make test and class methods discoverable
-  JUnit adapter
-Multiple ExpectedException
-Inheritance
-Test listeners
-Group regexps for launching
-
-====
-
-A new comment has been posted on your blog Otaku, Cedric's weblog, on entry
-#149 (The poor shape of Unit Testing).
-http://beust.com/weblog/archives/000149.html
-
-IP Address: 68.72.49.189
-Name: Curt Cox
-Email Address: [e-mail]
-URL: 
-
-Comments:
-
-For whatever its worth, here are my problems with JUnit.  I've largely developed work-arounds.
-
-1. Interface-based testing is awkward.
-2. Only fast-fail tests are supported.
-3. The design is brittle, poorly documented, and thus hard to extend.
-
-How should interface-based testing be handled in TestNG?  A nice feature would be bundled tests for interfaces in the java* namespace that are automatically applied.  In other words:
-- all classes will fail a (supressible) test if they violate the contract for equals() and hashCode()
-- classes that implement Comparable will fail a test if they fail to implement Comparable
-- and likewise for java.io.Serializable, java.util.Map, java.util.List, etc...
-
-When I say all tests are fast-fail in JUnit, what I mean is that the first failed assertion in a method causes the test to exit.  While this is usually desirable, a more conversational style of tests can sometimes be much easier to read and write.  Such a conversational test doesn't generate a simple failure, but rather a score.  The score could be either x of y passed or x percent passed.  The important part is that the first failure doesn't terminate the test.
-
-As I said, I've largely developed work-arounds for doing these in JUnit, but developing tools for conversational tests that play nice with the various JUnit runners was a real challenge.  The exact contract that Eclipse expects of JUnit tests turns out to be different than what either of the bundled runners or the Ant task expect.  Anyone who considers either the JUnit code or interfaces well-documented has a much different concept of well-documented than I do.
-
-
diff --git a/ant/README.template b/ant/README.template
deleted file mode 100644
index fe25c22..0000000
--- a/ant/README.template
+++ /dev/null
@@ -1,12 +0,0 @@
-[![Build Status](https://travis-ci.org/cbeust/testng.svg)](https://travis-ci.org/cbeust/testng)
-
-Welcome to TestNG ${version}
-
-Please note that even though the .zip distribution contains the TestNG sources,
-you will not be able to build the software with them because we decided
-not to include the external jar files in order to keep the size down.
-
-If you want to build TestNG, please sync to the GitHub repository at https://github.com/cbeust/testng.
-
---
-The TestNG team
diff --git a/ant/build-ant.xml b/ant/build-ant.xml
deleted file mode 100644
index 4502117..0000000
--- a/ant/build-ant.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<project name="testng" default="all" basedir=".">
-
-  <property file="build.properties"/>
-  <property name="this.directory" value="${test.dir}" />
-  <property name="test-output" value="${this.directory}/test-output" />
-
-  <taskdef name="testng" classname="org.testng.TestNGAntTask" classpath="${testng.jar}" />
-
-  <target name="all">
-    <echo>This dir: ${this.directory}</echo>
-    <delete failonerror="false" dir="${this.directory}/build" />
-  	<mkdir dir="${this.directory}/build" />
-  	
-  	<javac classpath="${testng.jar}"
-  		  destdir="${this.directory}/build" srcdir="${this.directory}" includes="test/ant/*.java" />
-
-<!--
-    <testng classpath="build;../../testng-5.2beta-jdk15.jar"
-            outputdir="test-output"
-    	      dumpcommand="true">
-        <xmlfileset dir="." includes="testng.xml"/>
-    </testng>
--->
-	<delete failonerror="false">
-	<fileset dir="${test-output}" includes="**"/></delete>
-  	
-    <testng classpath="${this.directory}/build;${testng.jar}"
-            outputdir="${test-output}"
-  	    parallel="methods"
-  	    threadcount="5"
-    	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
-    	haltonfailure="true"
-    	>
-        <classfileset dir="${this.directory}/build">
-        	<include name="test/ant/NoPackageTest.class" />
-        	<include name="test/ant/MultipleThreadTest.class" />
-        </classfileset>
-    </testng>
-  	
-  	<available file="${test-output}/Ant suite/Ant test.xml" 
-  		type="file" property="test.exists"/>
-  	<fail unless="test.exists" 
-  		message="The appropriately named output should have been created"/>
-  	
-    <testng classpath="${this.directory}/build;${testng.jar}"
-            outputdir="${test-output}"
-	   	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
-    	haltonfailure="true"
-    	suitename="Test Ant Suite"
-    	testname="Test Ant Test"
-    	>
-        <classfileset dir="${this.directory}/build">
-        	<include name="test/ant/DontOverrideSuiteNameTest.class" />
-         </classfileset>
-    </testng>
-  	
-  	<available file="${test-output}/Test Ant Suite/Test Ant Test.xml" 
-  		type="file" property="test2.exists"/>
-  	<fail unless="test2.exists" message="The appropriately named output should have been created"/>
-  	
-  	<!-- Ensure standard tests get run -->
-    <testng classpath="${this.directory}/build;${testng.jar}"
-            outputdir="${test-output}"
-    	listeners = "org.testng.reporters.FailedReporter, org.testng.reporters.DotTestListener"
-    	haltonfailure="true"
-    	>
-        <xmlfileset file="${test.resources.dir}/testng-ant.xml"/>
-    </testng>
-  	<available file="${test-output}/Suitename from xml/TestName.xml" 
-  		type="file" property="test3.exists"/>
-  	<fail unless="test3.exists" message="The appropriately named output should have been created"/>
-
-  </target>
-</project>
diff --git a/ant/build-tests.xml b/ant/build-tests.xml
deleted file mode 100644
index 4f51c47..0000000
--- a/ant/build-tests.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<project name="testng" default="all" basedir=".">
-
-  <property file="build.properties"/>
-
-  <property name="report.dir" value="${test.output.dir}"/>
-  <property name="junit.report.dir" value="${report.dir}/test-tmp"/>
-  <property name="testng.report.dir" value="${report.dir}"/>
-
-  <target name="all" depends="prepare,compile,run,reports,done"/>
-
-  <!-- ==================================================================== -->
-  <!-- Compile                                                              -->
-  <!-- ==================================================================== -->
-  <path id="compile.cp">
-    <pathelement location="${testng.jar}" />
-    <fileset dir="${lib.dir}" includes="${guice2.jar}" />
-    <fileset dir="${lib.dir}" includes="${junit.jar}" />
-    <fileset dir="${lib.dir}" includes="aopalliance-1.0.jar" />
-  </path>
-
-  <target name="env:info">
-    <echo>
-BASEDIR          =${basedir}
-TEST.DIR         =${test.dir}
-TEST.BUILD.DIR   =${test.build.dir}
-REPORT.DIR       =${report.dir}
-JUNIT.REPORT.DIR =${junit.report.dir}
-TESTNG.REPORT.DIR=${testng.report.dir}
-    </echo>
-  </target>
-
-  <target name="compile" depends="prepare">
-    <echo message="                                 -- Compiling tests --"/>
-
-    <property name="build.compiler" value="modern"/>
-    <javac debug="true"
-           source="1.7"
-           classpathref="compile.cp"
-           srcdir="${test.dir}"
-           destdir="${test.build.dir}"
-    />
-
-  </target>
-
-  <target name="prepare">
-    <tstamp/>
-    <mkdir dir="${test.build.dir}"/>
-    <mkdir dir="${junit.report.dir}"/>
-    <mkdir dir="${testng.report.dir}"/>
-
-  <taskdef name="testng"
-             classname="org.testng.TestNGAntTask"
-             classpath="${build.dir}"/>
-  </target>
-
-<!--
-  <property name="cobertura.dir" value="../cobertura-1.9.4.1" />
-
-  <path id="cobertura.classpath">
-      <fileset dir="${cobertura.dir}">
-          <include name="cobertura.jar" />
-          <include name="lib/**/*.jar" />
-      </fileset>
-  </path>
--->
-
-  <!-- ==================================================================== -->
-  <!-- Run                                                             -->
-  <!-- ==================================================================== -->
-
-  <path id="run.cp">
-<!--
-  	<path location="target/instrumented-classes" />
-  	<path refid="cobertura.classpath" />
--->
-    <path refid="compile.cp"/>
-    <pathelement location="${test.build.dir}"/>
-  </path>
-
-  <target name="run" description="Run tests" depends="compile,copy-resources">
-    <echo message="                                 -- Running tests --"/>
-    <echo message="                                 -- ${testng.jar} --" />
-    <testng classpathref="run.cp"
-            outputdir="${testng.report.dir}">
-      <xmlfileset dir="${test.resources.dir}" includes="testng.xml"/>
-      <jvmarg value="-Dtest.resources.dir=${test.resources.dir}" />
-      <jvmarg value="-Dsun.io.serialization.extendedDebugInfo=true" />
-    </testng>
-  </target>
-
-  <target name="copy-resources" description="Copies resources.">
-    <copy verbose="false"
-          file="${src.resources.dir}/testngtasks"
-          todir="${build.dir}" />
-    <copy todir="${build.dir}">
-      <fileset dir="${src.resources.dir}">
-        <exclude name="**/.*" />
-        <exclude name="**/CVS/*" />
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="run:single" description="Run 1 property file named with the ant property test" depends="compile">
-      <echo message="                                 -- testng-tests-run1 --"/>
-
-    <testng outputdir="${testng.report.dir}"
-        classpathref="run.cp"
-        useDefaultListeners="true"
-        outputDir="${testng.report.dir}">
-      <xmlfileset dir="${test.resources.dir}" includes="testng-single.xml"/>
-     </testng>
-
-      <echo>Report created in    open ${testng.report.dir}/index.html</echo>
-  </target>
-
-  <target name="run:antprop" description="Run a test to see if ant system propertes are passed correctly" depends="compile">
-      <echo message="                                 -- testng-tests-run-antprop --"/>
-      <property name="syspropset1" value="value 1"/>
-      <property name="syspropset2" value="value 2"/>
-      <propertyset id="propset1">
-          <propertyref name="syspropset1"/>
-          <propertyref name="syspropset2"/>
-      </propertyset>
-
-      <testng outputdir="${testng.report.dir}"
-              classpathref="run.cp">
-          <xmlfileset dir="${test.resources.dir}" includes="testng-single3.xml"/>
-          <propertyset refid="propset1"/>
-          <sysproperty key="sysprop1" value="value 3"/>
-      </testng>
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Run specific configuration                                           -->
-  <!-- ==================================================================== -->
-  <target name="run:conf"
-          if="testng.conf"
-          depends="clean:reports,compile"
-          description="Run specified tests">
-    <echo message="                                 -- testng-tests-run --"/>
-    <echo message="using: ${testng.conf}.xml"/>
-
-    <testng classpathref="run.cp"
-            outputDir="${testng.report.dir}">
-        <xmlfileset dir="${test.resources.dir}" includes="${testng.conf}.xml"/>
-    </testng>
-
-    <antcall target="clean.tmp"/>
-  </target>
-
-
-  <!-- ==================================================================== -->
-  <!-- Reports                                                              -->
-  <!-- ==================================================================== -->
-
-  <target name="reports">
-    <junitreport todir="${junit.report.dir}">
-      <fileset dir="${testng.report.dir}">
-        <include name="*.xml"/>
-        <exclude name="testng-failed.xml"/>
-        <exclude name="testng-results.xml" />
-      </fileset>
-      <report format="noframes" todir="${junit.report.dir}"/>
-    </junitreport>
-  </target>
-
-
-  <target name="clean.tmp">
-      <delete dir="${test.output.dir}"/>
-  </target>
-
-  <target name="clean:reports">
-      <delete dir="${report.dir}"/>
-      <delete dir="${junit.report.dir}"/>
-  </target>
-
-  <target name="clean" depends="clean.tmp,clean:reports">
-    <echo message="                                 -- test clean --"/>
-
-    <delete dir="${test.build.dir}"/>
-  </target>
-
-  <target name="done">
-    <echo>Reports can be found in:    open ${testng.report.dir}/index.html</echo>
-  </target>
-
-</project>
diff --git a/ant/build.properties b/ant/build.properties
deleted file mode 100644
index f4309d8..0000000
--- a/ant/build.properties
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# TestNG distribution
-#
-testng.basename=testng
-testng.version=6.8.14-SNAPSHOT
-testng.fullname=${testng.basename}-${testng.version}
-
-#
-# Global directories
-#
-root.dir=${basedir}
-build.3rdparty.dir=${root.dir}/build3rdparty
-build.maven-bundle.dir=${build.dir}/maven-bundle
-target=${root.dir}/target
-lib.dir=${basedir}/lib
-lib-supplied.dir=${basedir}/lib-supplied
-src.dir=${basedir}/src/main/java
-src.resources.dir=${basedir}/src/main/resources
-build.dir=${target}/classes
-test.dir=${basedir}/src/test/java
-test.build.dir=${target}/test-classes
-test.output.dir=${target}/test-output
-test.resources.dir=${basedir}/src/test/resources
-example.dir=${basedir}/examples
-
-#
-# Jar files
-#
-beanshell.jar=bsh-2.0b4.jar
-guice2.jar=guice-2.0.jar
-junit.jar=junit-4.10.jar
-ant.jar=ant-1.7.0.jar
-jcommander.jar=jcommander-1.27.jar
-yaml.jar=snakeyaml-1.12.jar
-
-all.jar.files=${beanshell.jar},${junit.jar},${ant.jar},${jcommander.jar},${yaml.jar},${guice2.jar}
-
-#
-# Names of distributions
-#
-testng.jar=${target}/${testng.fullname}.jar
-testng.dist.jar=${testng.fullname}-dist.jar
-sources.testng.jar=${testng.fullname}-sources.jar
-testng.junit.jar=${testng.fullname}-junit.jar
-testng.nobsh.noguice.jar=${testng.fullname}-nobsh-noguice.jar
-testng.bsh.noguice.jar=${testng.fullname}-bsh-noguice.jar
-testng.nobsh.guice.jar=${testng.fullname}-nobsh-guice.jar
-testng.ibiblio.jar=${testng.fullname}-bundle.jar
-testng.zip=${target}/${testng.fullname}.zip
-testng.maven-bundle=${target}/${testng.fullname}-bundle.jar
-testng.javadoc.zip=${testng.fullname}-javadoc.zip
-
-other.jars.dir=${target}/other-jars
-
-#
-# Test locations
-#
-test.location.msg=Test results can be found in\n\
-test/test-output/index.html
-
-#
-# Eclipse plug-in
-#
-testng-eclipse.dir=../testng-eclipse
-
-#
-# Maven plug-in version
-# Note, this version number is appended to the resulting plug-in jar
-#
-testng-maven.version=1.2
-
-#
-# JDK 1.4 for sanity checking before a distribution
-#
-java14.home=jdk-1.5.0_04
-#java14.home=c:/java/jdk-1.4.2_08
diff --git a/ant/build.xml b/ant/build.xml
deleted file mode 100644
index a1e4bba..0000000
--- a/ant/build.xml
+++ /dev/null
@@ -1,467 +0,0 @@
-<project name="testng" default="dev" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
-  
-  <!-- ====================================================================== -->
-  <!-- TestNG build file                                                      -->
-  <!-- Created cbeust, April 26th, 2004                                       -->
-  <!-- ====================================================================== -->
-
-  <property file="build.properties" />
-  <property name="optimize" value="false" />
-
-  <!-- ====================================================================== -->
-  <!-- PREPARE                                                                -->
-  <!-- ====================================================================== -->
-  <target name="prepare" depends="retrieve-dependencies"
-          description="Performs all preparations required to build.">
-    <tstamp />
-    <mkdir dir="${build.dir}" />
-    <mkdir dir="${other.jars.dir}" />
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- DUMP                                                                   -->
-  <!-- ====================================================================== -->
-  <target name="dump" description="Dumps all properties." depends="prepare">
-    <echoproperties />
-  </target>
-
-	<!-- ====================================================================== -->
-  <!-- VALIDATE                                                               -->
-  <!-- ====================================================================== -->
-
-  <target name="validate" description="Validates the build environment.">
-    <!-- java greater than 1.6 required to build -->
-    <condition property="requiredJavaVersion">
-      <or>
-        <equals arg1="${ant.java.version}" arg2="1.9" />
-        <equals arg1="${ant.java.version}" arg2="1.8" />
-        <equals arg1="${ant.java.version}" arg2="1.7" />
-      </or>
-    </condition>
-    <fail unless="requiredJavaVersion"
-          message="Java version 1.7 required." />
-    <!-- validate ant version too ... -->
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- COPY-RESOURCES                                                       -->
-  <!-- ==================================================================== -->
-
-  <target name="copy-resources" description="Copies resources.">
-    <copy verbose="false"
-          file="${src.resources.dir}/testngtasks"
-          todir="${build.dir}" />
-    <copy todir="${build.dir}">
-      <fileset dir="${src.resources.dir}">
-        <exclude name="**/.*" />
-        <exclude name="**/CVS/*" />
-      </fileset>
-    </copy>
-  </target>
-
-
-  <target name="dev"
-          depends="prepare,validate,copy-resources,build,tests" />
-
-  <target name="all"
-          depends="prepare,validate,copy-resources,build,dist,tests,test-ant,javadocs,dist" />
-
-  <target name="build" depends="prepare,compile,testng-jar-all" />
-
-  <target name="testng-jar-all">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${testng.jar}" />
-    </antcall>
-    <jar jarfile="${testng.jar}" update="true">
-      <zipfileset src="${lib.dir}/${beanshell.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${yaml.jar}" />
-    </jar>
-
-  </target>
-
-  <target name="single">
-    <ant antfile="build-tests.xml" target="run:single"/>
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Compile                                                              -->
-  <!-- ==================================================================== -->
-
-  <path id="compile2.cp">
-    <fileset dir="${lib.dir}" includes="${all.jar.files}" />
-  </path>
-
-  <target name="compile"
-          depends="prepare,copy-resources"
-          description="Compiles sources">
-    <echo message="                                 -- Compiling sources --" />
-
-    <echo>Src:${src.dir}</echo>
-    <javac classpathref="compile2.cp"
-           verbose="false"
-           target="1.7"
-           debug="true"
-           optimize="${optimize}"
-           destdir="${build.dir}">
-      <src path="${src.dir}" />
-    </javac>
-  </target>
-
-  <target name="compile:all" depends="compile" />
-
-  <target name="examples">
-    <ant inheritall="no" antfile="examples/build.xml" />
-  </target>
-
-  <target name="tests" depends="build" description="runs all JDK5 tests with JDK5 distro">
-    <ant inheritall="no" antfile="build-tests.xml" />
-  </target>
-  
-  <target name="test-ant" depends="build">
-    <echo message="                                 -- Testing ant testng task functionality --" />
-    <ant inheritall="no" antfile="build-ant.xml" />
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Documentation                                                        -->
-  <!-- ==================================================================== -->
-
-  <target name="javadocs" depends="build,javadocs-current" />
-
-  <target name="doclava">
-    <javadoc
-      docletpath="3rdparty/doclava-1.0.3.jar"
-      bootclasspath="${javahome}/jre/lib/rt.jar"
-      classpath="${testng.jar}:lib/${ant.jar}:lib/${guice2.jar}:lib/aopalliance-1.0.jar"
-      maxmemory="2048M"
-      additionalparam="-quiet"
-      verbose="false"
-      destdir="javadocs"
-      >
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/xml/Xml*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/annotations/**" />
-      </fileset>
-      <doclet name="com.google.doclava.Doclava">
-        <param name="-stubs" value="build/stubs" />
-        <param name="-hdf"/>
-        <param name="project.name" value="TestNG" />
-        <!-- versioning -->
-        <param name="-since"/>
-        <param name="doclava/previous.xml"/>
-        <param name="v1" />
-        <param name="-apiversion" value="v2"/>
-        <!-- federation -->
-        <param name="-federate" />
-        <param name="JDK"/>
-        <param name="http://download.oracle.com/javase/6/docs/api/index.html?"/>
-        <param name="-federationxml"/><param name="JDK"/>
-        <param name="http://doclava.googlecode.com/svn/static/api/openjdk-6.xml"/>
-      </doclet>
-    </javadoc>
-  </target>
-
-  <target name="javadocs-current">
-    <javadoc additionalparam="-quiet" destdir="javadocs" source="1.7" windowtitle="TestNG"
-      classpath="${testng.jar}" classpathref="compile2.cp" verbose="false">
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/xml/Xml*.java" />
-      </fileset>
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-        <include name="org/testng/annotations/**" />
-      </fileset>
-    </javadoc>
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Distribution                                                         -->
-  <!-- ==================================================================== -->
-
-  <target name="dist" depends="build,all-jar-flavors,dist-all-zip,eclipse" />
-
-  <target name="all-jar-flavors" depends="dist-junit,dist-nobsh-guice,dist-bsh-noguice,dist-nobsh-noguice,dist-testng-dist,dist-testng-javadoc" />
-
-  <target name="dist-junit">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.junit.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.junit.jar}" update="true">
-      <zipfileset src="${lib.dir}/${beanshell.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-      <zipfileset src="${lib.dir}/${yaml.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-nobsh-guice">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.guice.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.nobsh.guice.jar}" update="true">
-      <zipfileset src="${lib.dir}/${guice2.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-bsh-noguice">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.bsh.noguice.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">
-      <zipfileset src="${lib.dir}/${beanshell.jar}" />
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-nobsh-noguice">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.nobsh.noguice.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.bsh.noguice.jar}" update="true">
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-      <zipfileset src="${lib.dir}/${junit.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-testng-dist">
-    <antcall target="create-jar">
-      <param name="jar.file" value="${other.jars.dir}/${testng.dist.jar}" />
-    </antcall>
-    <jar jarfile="${other.jars.dir}/${testng.dist.jar}" update="true">
-      <zipfileset src="${lib.dir}/${jcommander.jar}" />
-    </jar>
-  </target>
-
-  <target name="dist-testng-javadoc" depends="javadocs">
-    <zip destfile="${other.jars.dir}/${testng.javadoc.zip}">
-        <fileset dir="javadocs"/>
-    </zip>
-  </target>
-
-  <target name="create-jar" description="Create a jar file with the Testng classes and nothing else" 
-          depends="compile">
-    <delete file="${jar.file}" />
-    <jar destfile="${jar.file}" >
-      <manifest>
-        <attribute name="Main-Class" value="org.testng.TestNG" />
-        <attribute name="Implementation-Version" value="${testng.version}-${DSTAMP}${TSTAMP}" />
-      </manifest>
-      <fileset dir="${build.dir}" />
-      <fileset file="TESTNG-${testng.version}" />
-    </jar>
-  </target>
-
-  <target name="dist-all-zip" depends="dist-prepare,javadocs">
-    <property name="zip.dir" value="testng-${testng.version}" />
-    <echo>Adding ${testng.fullname}</echo>
-    <zip zipfile="${testng.zip}">
-      <zipfileset prefix="${zip.dir}" dir="${target}">
-        <include name="${testng.fullname}.jar" />
-      </zipfileset>
-      <zipfileset prefix="${zip.dir}" dir="${basedir}" includesfile="FILES" />
-      <zipfileset dir="${other.jars.dir}" prefix="${zip.dir}/other-jars"/>
-      <zipfileset dir="javadocs" prefix="${zip.dir}/javadocs" />
-      <zipfileset dir="src" prefix="${zip.dir}/src" />
-      <zipfileset dir="spring" prefix="${zip.dir}/spring" />
-      <zipfileset dir="doc" prefix="${zip.dir}/doc" />
-      <zipfileset dir="${src.resources.dir}"
-               prefix="${zip.dir}/resources" 
-            includes="**/*.css"/>
-    </zip>
-  </target>
-  
-<!--
-  <target name="dist-maven-bundle" depends="dist-all-zip">
-    <mkdir dir="${build.maven-bundle.dir}" />
-    <copy file="bundle-pom.xml" tofile="${build.maven-bundle.dir}/pom.xml" overwrite="true">
-      <filterchain>
-        <expandproperties/>
-      </filterchain>
-    </copy>
-    <jar destfile="${build.maven-bundle.dir}/${sources.testng.jar}">
-      <fileset dir="${src.dir}" />
-    </jar>
-
-    <exec executable="gpg">
-      <arg value="- -yes" />
-      <arg value="-ab" />
-      <arg value="${testng.jar}" />
-    </exec>
-
-    <exec executable="gpg">
-      <arg value="- -yes" />
-      <arg value="-ab" />
-      <arg value="${build.maven-bundle.dir}/pom.xml" />
-    </exec>
-
-    <exec executable="gpg">
-      <arg value="- -yes" />
-      <arg value="-ab" />
-      <arg value="${build.maven-bundle.dir}/${sources.testng.jar}" />
-    </exec>
-
-    <jar destfile="${testng.maven-bundle}">
-      <fileset file="${build.maven-bundle.dir}/pom.xml" />
-      <fileset file="${build.maven-bundle.dir}/${sources.testng.jar}" />
-      <fileset file="${build.maven-bundle.dir}/*asc" />
-      <fileset file="${testng.jar}" />
-      <fileset file="${testng.jar}.asc" />
-    </jar>
-  </target>
--->
-
-  <target name="dist-prepare" depends="update-readme">
-    <delete file="{other.jars.dir}/${testng.nobsh.jar}" />
-    <mkdir dir="${other.jars.dir}" />
-  </target>
-
-  <target name="update-readme">
-    <copy file="README.template" tofile="README.md" />
-    <replace file="README.md" token="${version}" value="${testng.version}" />
-    <touch file="TESTNG-${testng.version}" />
-  </target>
-      
-  <target name="eclipse" description="Used by Cedric to build distributions">
-    <property name="jdk15.jar"
-              value="${testng-eclipse.dir}/lib/testng.jar" />
-
-    <delete file="${jdk15.jar}" />
-    <copy file="${testng.jar}" tofile="${jdk15.jar}" />
-
-    <!-- sources -->
-    <property name="sources" value="${testng-eclipse.dir}/lib/testng-sources.jar"/>
-    <echo>Sources: ${sources}</echo>
-    <jar destfile="${sources}" basedir="src/main/java/" />
-  </target>
-
-  <target name="ftp">
-    <!--
-          <ftp action="put"
-             server="beust.com"
-             remotedir="w/testng/test-output"
-             userid="${userid}"
-             password="${password}">
-              <fileset dir="c:\weblogic\dev\sandbox\cbeust\testng\test\test-output">
-                <include name="index.html" />
-                <include name="main.html" />
-                <include name="toc.html" />
-                <include name="*egression*" />
-             </fileset>
-        </ftp>
-      -->
-    <ftp action="put"
-         server="beust.com"
-         remotedir="w/testng"
-         userid="${userid}"
-         password="${password}">
-      <fileset dir="${root.dir}">
-        <include name="${testng.zip}" />
-        <include name="javadocs/**" />
-        <include name="testng-1.0.dtd" />
-      </fileset>
-      <fileset dir="${root.dir}/doc">
-        <include name="*.html" />
-      </fileset>
-    </ftp>
-
-  </target>
-
-  <target name="ftp2">
-    <ftp action="put"
-         server="beust.com"
-         remotedir="w/testng"
-         userid="${userid}"
-         password="${password}">
-      <fileset dir="${root.dir}/test">
-        <include name="test-output/*" />
-      </fileset>
-      <fileset dir="${root.dir}/test">
-        <include name="test-report/*" />
-      </fileset>
-    </ftp>
-  </target>
-
-  <target name="clean">
-    <delete dir="${build.dir}" />
-    <delete dir="${target}" />
-    <delete dir="${build.maven-bundle.dir}" />
-    <delete failonerror="false">
-      <fileset dir="." includes="testng*.jar,*.zip" />
-    </delete>
-    <delete dir="test-output" failonerror="false" />
-    <delete dir="test-output-tests" failonerror="false" />
-    <ant antfile="build-tests.xml" target="clean" />
-    <ant dir="examples" target="clean" />
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Maven1/2 Distribution                                                -->
-  <!-- ==================================================================== -->
-
-<!--
-  <target name="maven-plugin">
-    <jar destfile="maven-testng-plugin-${testng-maven.version}.jar"
-         basedir="./maven/" />
-  </target>
--->
-
-  <!-- ==================================================================== -->
-  <!-- Ivy                                                                  -->
-  <!-- ==================================================================== -->
-
-  <target name="retrieve-dependencies" description="Retrieve dependencies with ivy">
-    <ivy:retrieve log="quiet" />
-  </target>
-
-  <target name="publish">
-    <ivy:resolve />
-    <mkdir dir="dist/jars" />
-    <copy file="${testng.jar}" todir="dist/jars" />
-    <ivy:publish organisation="org.testng" resolver="local" overwrite="true"/>
-  </target>
-
-  <target name="pom">
-    <ivy:makepom ivyfile="ivy.xml" pomfile="ivy-pom.xml" />
-  </target>
-
-  <!-- ==================================================================== -->
-  <!-- Code coverage                                                        -->
-  <!-- ==================================================================== -->
-
-<!--
-  <property name="cobertura.dir" value="../cobertura-1.9.4.1" />
-
-  <path id="cobertura.classpath">
-      <fileset dir="${cobertura.dir}">
-          <include name="cobertura.jar" />
-          <include name="lib/**/*.jar" />
-      </fileset>
-  </path>
-
-  <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
-
-  <target name="coverage:create">
-    <cobertura-instrument classpath="cobertura-1.9.4.1/lib/*" todir="target/instrumented-classes">
-      <fileset dir="${build.dir}">
-        <include name="**/*.class" />
-      </fileset>
-    </cobertura-instrument>
-  </target>
-
-  <target name="coverage">
-    <cobertura-report srcdir="${src.dir}" destdir="target/coverage-report"/>
-  </target>
--->
-
-</project>
diff --git a/ant/ivy.xml b/ant/ivy.xml
deleted file mode 100644
index c6a5a97..0000000
--- a/ant/ivy.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<ivy-module version="2.0">
-  <info organisation="org.testng" module="testng" revision="6.5beta"/>
-
-  <dependencies>
-    <dependency org="org.apache.ant" name="ant" rev="1.7.0" />
-    <dependency org="junit" name="junit" rev="4.10" />
-    <dependency org="org.beanshell" name="bsh" rev="2.0b4" />
-    <dependency org="com.google.inject" name="guice" rev="2.0" />
-    <dependency org="org.yaml" name="snakeyaml" rev="1.15" />
-    <dependency org="com.beust" name="jcommander" rev="1.48" />
-  </dependencies>
-</ivy-module>
-
diff --git a/ant/old/build-dogfood.xml b/ant/old/build-dogfood.xml
deleted file mode 100644
index 0e39867..0000000
--- a/ant/old/build-dogfood.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<project name="testng" default="run" basedir=".">
-	<property name="testng.home" value="${basedir}/../" />
-    <property name="lib.dir" value="${testng.home}/3rdparty"/>
- 	<property file="../build.properties"/>
-
-	<path id="run.cp">
-		<pathelement location="../z_build" />
-		<fileset dir="${lib.dir}">
-			<include name="junit.jar"/>
-			<include name="${beanshell.jar}"/>
-			<include name="${qdox.jar}"/>
-		</fileset>
- 		<pathelement location="${java.home}/../lib/tools.jar"/>
-	</path>
-
-	<target name="run" description="Run tests" >
-		<echo>Defining task from ${basedir}/../${jdk15.testng.jar}</echo>
-		<taskdef name="testng"
-              classname="org.testng.TestNGAntTask"
-              classpath="${basedir}/../${jdk15.testng.jar}" />
-
-		<testng classpathref="run.cp"
-        dumpcommand="true" verbose="9" outputdir="test-outputs" haltonfailure="true">
-			<xmlfileset dir="${basedir}">
-				<include name="testng-single.xml" />
-			</xmlfileset>
-		</testng>
-	</target>
-
-</project>
diff --git a/ant/old/build-sample.xml b/ant/old/build-sample.xml
deleted file mode 100644
index 3ffea58..0000000
--- a/ant/old/build-sample.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<project name="testng" default="run" basedir=".">
-
-	<property name="testng.home" value="c:/java/testng" />
-    <property name="lib.dir" value="${testng.home}/lib"/>
-    <property name="testng.jar" value="${testng.home}/testng-2.5-jdk15.jar" />
-
-	<path id="run.cp">
-		<!--
-      <path refid="compile.cp"/>
--->
-		<pathelement location="build" />
-		<pathelement location="${lib.dir}/qdox-1.5.jar"/>
-		<pathelement location="${java.home}/../lib/tools.jar"/>
-	</path>
-
-	<target name="run" description="Run tests" >
-		<echo>Defining task from ${testng.jar}</echo>
-		<taskdef name="testng"
-              classname="org.testng.TestNGAntTask"
-              classpath="${testng.jar}" />
-
-		<testng classpathref="run.cp"
-        dumpcommand="true" verbose="9" outputdir="test-outputs">
-			<classfileset dir="build">
-				<include name="**/justin/*Test*.class" />
-			</classfileset>
-		</testng>
-	</target>
-
-</project>
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 3212f2d..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-version: "{branch} {build}"
-skip_tags: true
-clone_depth: 10
-
-build:
-  verbosity: detailed
-
-build_script:
-  - gradlew.bat assemble --info --no-daemon
-
-test_script:
-  - gradlew.bat test --info --no-daemon
-
-environment:
-  matrix:
-  - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
-  - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-  - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.7.0
-  - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
-
-matrix:
-  fast_finish: true
-
-cache:
-  - C:\Users\appveyor\.gradle
\ No newline at end of file
diff --git a/build-logic/basics/build.gradle.kts b/build-logic/basics/build.gradle.kts
new file mode 100644
index 0000000..bc0172f
--- /dev/null
+++ b/build-logic/basics/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+    `kotlin-dsl`
+}
diff --git a/build-logic/basics/src/main/kotlin/testng.repositories.gradle.kts b/build-logic/basics/src/main/kotlin/testng.repositories.gradle.kts
new file mode 100644
index 0000000..1e4717f
--- /dev/null
+++ b/build-logic/basics/src/main/kotlin/testng.repositories.gradle.kts
@@ -0,0 +1,10 @@
+// Can't use settings plugin: https://github.com/gradle/gradle/issues/17295
+// dependencyResolutionManagement {
+//    repositories {
+//        mavenCentral()
+//    }
+//}
+
+repositories {
+    mavenCentral()
+}
diff --git a/build-logic/basics/src/main/kotlin/testng.reproducible-builds.gradle.kts b/build-logic/basics/src/main/kotlin/testng.reproducible-builds.gradle.kts
new file mode 100644
index 0000000..cab1514
--- /dev/null
+++ b/build-logic/basics/src/main/kotlin/testng.reproducible-builds.gradle.kts
@@ -0,0 +1,7 @@
+tasks.withType<AbstractArchiveTask>().configureEach {
+    // Ensure builds are reproducible
+    isPreserveFileTimestamps = false
+    isReproducibleFileOrder = true
+    dirMode = "775".toInt(8)
+    fileMode = "664".toInt(8)
+}
diff --git a/build-logic/basics/src/main/kotlin/testng.versioning.gradle.kts b/build-logic/basics/src/main/kotlin/testng.versioning.gradle.kts
new file mode 100644
index 0000000..09eb6c9
--- /dev/null
+++ b/build-logic/basics/src/main/kotlin/testng.versioning.gradle.kts
@@ -0,0 +1,5 @@
+if (project != rootProject) {
+    // The root project takes its version from /gradle.properties -> testng.version
+    // All the rest projects take the version from the root
+    version = rootProject.version
+}
diff --git a/build-logic/code-quality/build.gradle.kts b/build-logic/code-quality/build.gradle.kts
new file mode 100644
index 0000000..3955765
--- /dev/null
+++ b/build-logic/code-quality/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation("org.sonarqube:org.sonarqube.gradle.plugin:2.8")
+    implementation("com.github.autostyle:autostyle-plugin-gradle:3.1")
+}
diff --git a/build-logic/code-quality/src/main/kotlin/testng.sonarqube.gradle.kts b/build-logic/code-quality/src/main/kotlin/testng.sonarqube.gradle.kts
new file mode 100644
index 0000000..7551b01
--- /dev/null
+++ b/build-logic/code-quality/src/main/kotlin/testng.sonarqube.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+    id("org.sonarqube")
+}
+
+sonarqube {
+    properties {
+        property("sonar.host.url", "https://sonarcloud.io/")
+        property("sonar.organization", "testng-team")
+        property("sonar.github.repository", "cbeust/testng")
+        property("sonar.github.login", "testng-bot")
+    }
+}
diff --git a/build-logic/code-quality/src/main/kotlin/testng.style.gradle.kts b/build-logic/code-quality/src/main/kotlin/testng.style.gradle.kts
new file mode 100644
index 0000000..709e849
--- /dev/null
+++ b/build-logic/code-quality/src/main/kotlin/testng.style.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    id("com.github.autostyle")
+}
+
+autostyle {
+    java {
+        importOrder()
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+        googleJavaFormat()
+    }
+}
diff --git a/build-logic/code-quality/src/main/kotlin/testng.testing.gradle.kts b/build-logic/code-quality/src/main/kotlin/testng.testing.gradle.kts
new file mode 100644
index 0000000..ff097f5
--- /dev/null
+++ b/build-logic/code-quality/src/main/kotlin/testng.testing.gradle.kts
@@ -0,0 +1,40 @@
+import org.gradle.api.tasks.testing.Test
+
+plugins {
+    `java-library`
+}
+
+dependencies {
+    testImplementation("org.assertj:assertj-core:_")
+}
+
+tasks.withType<Test>().configureEach {
+    useTestNG()
+    providers.gradleProperty("testng.test.extra.jvmargs")
+        .forUseAtConfigurationTime()
+        .orNull?.toString()?.trim()
+        ?.takeIf { it.isNotEmpty() }
+        ?.let {
+            // TODO: support quoted arguments
+            jvmArgs(it.split(Regex("\\s+")))
+        }
+    systemProperty("test.resources.dir", "build/resources/test")
+    fun passProperty(name: String, default: String? = null) {
+        val value = System.getProperty(name) ?: default
+        value?.let { systemProperty(name, it) }
+    }
+    // Default verbose is 0, however, it can be adjusted vi -Dtestng.default.verbose=2
+    passProperty("testng.default.verbose", "0")
+    // Allow running tests in a custom locale with -Duser.language=...
+    passProperty("user.language")
+    passProperty("user.country")
+
+    @Suppress("unchecked_cast")
+    val props = System.getProperties().propertyNames() as `java.util`.Enumeration<String>
+    // Pass testng.* properties to the test JVM
+    for (e in props) {
+        if (e.startsWith("testng.")) {
+            passProperty(e)
+        }
+    }
+}
diff --git a/build-logic/jvm/build.gradle.kts b/build-logic/jvm/build.gradle.kts
new file mode 100644
index 0000000..5323a4e
--- /dev/null
+++ b/build-logic/jvm/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(project(":basics"))
+    implementation(project(":code-quality"))
+    implementation("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.74")
+    implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.5.10")
+}
diff --git a/build-logic/jvm/src/main/kotlin/buildlogic/CopySpecExtensions.kt b/build-logic/jvm/src/main/kotlin/buildlogic/CopySpecExtensions.kt
new file mode 100644
index 0000000..2b3df5b
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/buildlogic/CopySpecExtensions.kt
@@ -0,0 +1,16 @@
+package buildlogic
+
+import org.apache.tools.ant.filters.FixCrLfFilter
+import org.gradle.api.file.CopySpec
+import org.gradle.kotlin.dsl.filter
+
+fun CopySpec.filterEolSimple(eol: String) {
+    filteringCharset = "UTF-8"
+    filter(
+        FixCrLfFilter::class, mapOf(
+            "eol" to FixCrLfFilter.CrLf.newInstance(eol),
+            "fixlast" to true,
+            "ctrlz" to FixCrLfFilter.AddAsisRemove.newInstance("asis")
+        )
+    )
+}
diff --git a/build-logic/jvm/src/main/kotlin/testng.java-library.gradle.kts b/build-logic/jvm/src/main/kotlin/testng.java-library.gradle.kts
new file mode 100644
index 0000000..8ccc1a1
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/testng.java-library.gradle.kts
@@ -0,0 +1,64 @@
+import buildlogic.filterEolSimple
+
+plugins {
+    `java-library`
+    id("testng.java")
+    id("testng.testing")
+}
+
+tasks.withType<Javadoc>().configureEach {
+    excludes.add("org/testng/internal/**")
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    inputs.property("java.version", System.getProperty("java.version"))
+    inputs.property("java.vm.version", System.getProperty("java.vm.version"))
+    options.apply {
+        encoding = "UTF-8"
+        compilerArgs.add("-Xlint:deprecation")
+        compilerArgs.add("-Werror")
+    }
+}
+
+tasks.withType<Jar>().configureEach {
+    into("META-INF") {
+        filterEolSimple("crlf")
+        from("$rootDir/LICENSE.txt")
+        from("$rootDir/NOTICE")
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+    manifest {
+        // providers.gradleProperty does not work
+        // see https://github.com/gradle/gradle/issues/14972
+        val name = rootProject.findProperty("project.name")
+        val vendor = rootProject.findProperty("project.vendor.name")
+        attributes(mapOf(
+            "Specification-Title" to name,
+            "Specification-Version" to project.version,
+            "Specification-Vendor" to vendor,
+            "Implementation-Title" to name,
+            "Implementation-Version" to project.version,
+            "Implementation-Vendor" to vendor,
+            "Implementation-Vendor-Id" to rootProject.findProperty("project.vendor.id"),
+            "Implementation-Url" to rootProject.findProperty("project.url"),
+        ))
+    }
+}
+
+@Suppress("unused")
+val transitiveSourcesElements by configurations.creating {
+    description = "Share sources folder with other projects for aggregation (e.g. sources, javadocs, etc)"
+    isVisible = false
+    isCanBeResolved = false
+    isCanBeConsumed = true
+    extendsFrom(configurations.implementation.get())
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
+        attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named("source-folders"))
+    }
+    // afterEvaluate is to allow creation of the new source sets
+    afterEvaluate {
+        sourceSets.main.get().java.srcDirs.forEach { outgoing.artifact(it) }
+    }
+}
diff --git a/build-logic/jvm/src/main/kotlin/testng.java-platform.gradle.kts b/build-logic/jvm/src/main/kotlin/testng.java-platform.gradle.kts
new file mode 100644
index 0000000..7b0fb95
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/testng.java-platform.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    id("testng.java")
+    `java-platform`
+}
diff --git a/build-logic/jvm/src/main/kotlin/testng.java.gradle.kts b/build-logic/jvm/src/main/kotlin/testng.java.gradle.kts
new file mode 100644
index 0000000..85e0d6d
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/testng.java.gradle.kts
@@ -0,0 +1,28 @@
+plugins {
+    `java-base`
+    id("testng.versioning")
+    id("testng.style")
+    id("testng.repositories")
+    // Improves Gradle Test logging
+    // See https://github.com/vlsi/vlsi-release-plugins/tree/master/plugins/gradle-extensions-plugin
+    id("com.github.vlsi.gradle-extensions")
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    inputs.property("java.version", System.getProperty("java.version"))
+    inputs.property("java.vendor", System.getProperty("java.vendor"))
+    inputs.property("java.vm.version", System.getProperty("java.vm.version"))
+    inputs.property("java.vm.vendor", System.getProperty("java.vm.vendor"))
+}
+
+tasks.withType<Test>().configureEach {
+    inputs.property("java.version", System.getProperty("java.version"))
+    inputs.property("java.vendor", System.getProperty("java.vendor"))
+    inputs.property("java.vm.version", System.getProperty("java.vm.version"))
+    inputs.property("java.vm.vendor", System.getProperty("java.vm.vendor"))
+}
diff --git a/build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts b/build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts
new file mode 100644
index 0000000..e4ad87d
--- /dev/null
+++ b/build-logic/jvm/src/main/kotlin/testng.kotlin-library.gradle.kts
@@ -0,0 +1,17 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    id("testng.java-library")
+    kotlin("jvm")
+}
+
+dependencies {
+    testImplementation(platform("org.jetbrains.kotlin:kotlin-bom:1.5.10"))
+    testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
diff --git a/build-logic/publishing/build.gradle.kts b/build-logic/publishing/build.gradle.kts
new file mode 100644
index 0000000..5bc085b
--- /dev/null
+++ b/build-logic/publishing/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(project(":jvm"))
+    implementation("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.74")
+    implementation("com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:7.0.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
+}
diff --git a/build-logic/publishing/src/main/kotlin/buildlogic/ConfigurationExtensions.kt b/build-logic/publishing/src/main/kotlin/buildlogic/ConfigurationExtensions.kt
new file mode 100644
index 0000000..e677b36
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/buildlogic/ConfigurationExtensions.kt
@@ -0,0 +1,19 @@
+package buildlogic
+
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.attributes.Category
+import org.gradle.api.attributes.Usage
+import org.gradle.api.model.ObjectFactory
+import org.gradle.kotlin.dsl.named
+
+fun Configuration.javaLibrary(objects: ObjectFactory, usage: String) =
+    attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(usage))
+    }
+
+fun Configuration.javaLibraryApi(objects: ObjectFactory) =
+    javaLibrary(objects, Usage.JAVA_API)
+
+fun Configuration.javaLibraryRuntime(objects: ObjectFactory) =
+    javaLibrary(objects, Usage.JAVA_RUNTIME)
diff --git a/build-logic/publishing/src/main/kotlin/buildlogic/CopySpecExtensions.kt b/build-logic/publishing/src/main/kotlin/buildlogic/CopySpecExtensions.kt
new file mode 100644
index 0000000..2b3df5b
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/buildlogic/CopySpecExtensions.kt
@@ -0,0 +1,16 @@
+package buildlogic
+
+import org.apache.tools.ant.filters.FixCrLfFilter
+import org.gradle.api.file.CopySpec
+import org.gradle.kotlin.dsl.filter
+
+fun CopySpec.filterEolSimple(eol: String) {
+    filteringCharset = "UTF-8"
+    filter(
+        FixCrLfFilter::class, mapOf(
+            "eol" to FixCrLfFilter.CrLf.newInstance(eol),
+            "fixlast" to true,
+            "ctrlz" to FixCrLfFilter.AddAsisRemove.newInstance("asis")
+        )
+    )
+}
diff --git a/build-logic/publishing/src/main/kotlin/buildlogic/DependencyHandlerExtensions.kt b/build-logic/publishing/src/main/kotlin/buildlogic/DependencyHandlerExtensions.kt
new file mode 100644
index 0000000..3b4100d
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/buildlogic/DependencyHandlerExtensions.kt
@@ -0,0 +1,34 @@
+package buildlogic
+
+import org.gradle.api.artifacts.Dependency
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
+import org.gradle.api.artifacts.component.ProjectComponentIdentifier
+import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.artifacts.result.ResolvedVariantResult
+import org.gradle.api.attributes.Category
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.project
+
+/**
+ * Converts the resolved result back to a dependency notation, so it can be resolved again.
+ * Note: the conversion does not support "classifiers"
+ */
+fun DependencyHandler.reconstruct(variant: ResolvedVariantResult): Dependency {
+    val category = variant.attributes.run {
+        keySet().firstOrNull { it.name == Category.CATEGORY_ATTRIBUTE.name }?.let { getAttribute(it) }
+    }
+
+    val id = variant.owner
+    return when (id) {
+        is ProjectComponentIdentifier -> project(id.projectPath)
+        is ModuleComponentIdentifier -> create(id.group, id.module, id.version)
+        else -> throw IllegalArgumentException("Can't convert $id to dependency")
+    }.let {
+        when (category) {
+            Category.REGULAR_PLATFORM -> platform(it)
+            Category.ENFORCED_PLATFORM -> enforcedPlatform(it)
+            Category.LIBRARY -> it
+            else -> throw IllegalStateException("Unexpected dependency type $category for id $id")
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/buildlogic/FirstLayerDependencies.kt b/build-logic/publishing/src/main/kotlin/buildlogic/FirstLayerDependencies.kt
new file mode 100644
index 0000000..af43dfa
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/buildlogic/FirstLayerDependencies.kt
@@ -0,0 +1,89 @@
+package buildlogic
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.result.ResolvedComponentResult
+import org.gradle.api.artifacts.result.ResolvedDependencyResult
+import org.gradle.api.artifacts.result.ResolvedVariantResult
+import org.gradle.api.artifacts.result.UnresolvedDependencyResult
+import org.gradle.api.plugins.ExtensionAware
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.the
+
+/**
+ * Walks over the dependency tree and selects the first non-shaded dependencies.
+ */
+fun ResolvedComponentResult.filterFirstLayerDependenciesTo(
+    set: MutableSet<ResolvedVariantResult>,
+    isShaded: (ResolvedVariantResult) -> Boolean
+): MutableSet<ResolvedVariantResult> {
+    for (dependency in dependencies) {
+        when (dependency) {
+            is UnresolvedDependencyResult -> throw IllegalStateException(
+                "Unresolved dependency $dependency: ${dependency.failure}",
+                dependency.failure
+            )
+            is ResolvedDependencyResult -> {
+                val resolvedVariant = dependency.resolvedVariant
+                if (resolvedVariant in set) {
+                    continue
+                }
+                if (isShaded(resolvedVariant)) {
+                    dependency.selected.filterFirstLayerDependenciesTo(set, isShaded)
+                    continue
+                }
+                // Ok, we detected the first non-shaded dependency, so we do not need to dig its dependencies
+                set += resolvedVariant
+            }
+        }
+    }
+    return set
+}
+
+fun ResolvedComponentResult.filterFirstLayerDependencies(isShaded: (ResolvedVariantResult) -> Boolean) =
+    filterFirstLayerDependenciesTo(mutableSetOf(), isShaded)
+
+/**
+ * Prepares a configuration that selects the first non-shaded dependencies:
+ *  1. It resolves "AllDependencies" configuration
+ *  2. Then the function walks over the dependency tree and finds the first non-shaded dependencies
+ *  3. Then it converts the resolution results to dependency notation
+ *  4. The collected dependencies are added to "FirstNonMergedDependencies" configuration.
+ * Note: the trigger for all this computation is withDependencies, so the resolution performed only when it is required.
+ */
+fun Project.firstLayerDependencies(
+    usage: String,
+    conf: Configuration,
+    vararg rest: Configuration,
+): Configuration {
+    val optionalFeatures = (the<JavaPluginExtension>() as ExtensionAware).the<OptionalFeaturesExtension>()
+    val usageKind = usage.removePrefix("java-").capitalize()
+
+    val allDependencies = configurations.create(conf.name + "${usageKind}AllDependencies") {
+        description = "Resolves the list of all dependencies for $usage in ${conf.name}"
+        isCanBeConsumed = false
+        isCanBeResolved = true
+        isVisible = false
+        extendsFrom(conf)
+        extendsFrom(*rest)
+        javaLibrary(objects, usage)
+    }
+
+    return configurations.create(conf.name + "${usageKind}FirstNonMergedDependencies") {
+        description = "Resolves the list of external dependencies for $usage in ${conf.name}"
+        isCanBeConsumed = false
+        isCanBeResolved = true
+        isTransitive = false
+        isVisible = false
+        javaLibrary(objects, usage)
+        withDependencies {
+            // Clear any user-added-by-mistake dependencies
+            clear()
+            addAll(
+                allDependencies.incoming.resolutionResult.root
+                    .filterFirstLayerDependencies(optionalFeatures.shadedDependenciesFilter.get())
+                    .map { project.dependencies.reconstruct(it) }
+            )
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/buildlogic/OptionalFeaturesExtension.kt b/build-logic/publishing/src/main/kotlin/buildlogic/OptionalFeaturesExtension.kt
new file mode 100644
index 0000000..05bbf2a
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/buildlogic/OptionalFeaturesExtension.kt
@@ -0,0 +1,100 @@
+package buildlogic
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.component.ProjectComponentIdentifier
+import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.artifacts.result.ResolvedVariantResult
+import org.gradle.api.attributes.Usage
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.SourceSetContainer
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.invoke
+import org.gradle.kotlin.dsl.provideDelegate
+import org.gradle.kotlin.dsl.the
+
+/**
+ * DSL for declaring optional features. The dependencies are stored to plugin-local "declared-*" configurations
+ */
+class OptionalFeatureBuilder(
+    private val dependencyHandler: DependencyHandler,
+    private val declaredApi: Configuration,
+    private val declaredImplementation: Configuration
+) {
+    fun platform(dependencyNotation: Any) =
+        dependencyHandler.platform(dependencyNotation)
+
+    fun api(dependencyNotation: Any) {
+        dependencyHandler.add(declaredApi.name, dependencyNotation)
+    }
+
+    fun implementation(dependencyNotation: Any) {
+        dependencyHandler.add(declaredImplementation.name, dependencyNotation)
+    }
+}
+
+abstract class OptionalFeaturesExtension(private val project: Project) {
+    // It allows to explicitly list which modules should be merged and which will be left alone as dependencies
+    abstract val shadedDependenciesFilter: Property<(ResolvedVariantResult) -> Boolean>
+
+    init {
+        // By default, shade all modules from the current build
+        shadedDependenciesFilter.convention {
+            it.owner.let { id -> id is ProjectComponentIdentifier && id.build.isCurrentBuild }
+        }
+    }
+
+    fun create(name: String, builder: OptionalFeatureBuilder.() -> Unit) {
+        project.the<JavaPluginExtension>().registerFeature(name) {
+            val sourceSets: SourceSetContainer by project
+            usingSourceSet(sourceSets["main"])
+        }
+
+        val declaredApi = project.configurations.create("${name}DeclaredApi") {
+            description = "Api dependencies for feature $name"
+            isCanBeResolved = false
+            isCanBeConsumed = false
+        }
+        val declaredImplementation = project.configurations.create("${name}DeclaredImplementation") {
+            description = "Implementation dependencies for feature $name"
+            isCanBeResolved = false
+            isCanBeConsumed = false
+        }
+        val declaredRuntime = project.configurations.create("${name}DeclaredRuntime") {
+            description = "Runtime dependencies for feature $name"
+            isCanBeResolved = false
+            isCanBeConsumed = false
+            extendsFrom(declaredApi, declaredImplementation)
+        }
+
+        OptionalFeatureBuilder(
+            project.dependencies,
+            declaredApi,
+            declaredImplementation
+        ).builder()
+
+        // This is to include all testng modules (even optional) to -all.jar
+        project.configurations["shadedDependencyFullRuntimeClasspath"]
+            .extendsFrom(declaredRuntime)
+
+        // By default Gradle adds the jar as artifact, however, we won't need it
+        // We'll put merged jar later as a main artifact
+        project.configurations {
+            get("${name}ApiElements").apply {
+                // This effectively adds "optional" pom dependencies for scope=compile
+                extendsFrom(project.firstLayerDependencies(Usage.JAVA_API, declaredApi))
+                artifacts.clear()
+                // The feature do not provide their own classes or resources
+                // All the feature resources would come from the dependencies
+                outgoing.variants.removeIf { it.name == "classes" || it.name == "resources" }
+            }
+            get("${name}RuntimeElements").apply {
+                // This effectively adds "optional" pom dependencies for scope=runtime
+                extendsFrom(project.firstLayerDependencies(Usage.JAVA_RUNTIME, declaredRuntime))
+                artifacts.clear()
+                outgoing.variants.removeIf { it.name == "classes" || it.name == "resources" }
+            }
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/testng.local-maven-repo.gradle.kts b/build-logic/publishing/src/main/kotlin/testng.local-maven-repo.gradle.kts
new file mode 100644
index 0000000..cef8f94
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/testng.local-maven-repo.gradle.kts
@@ -0,0 +1,40 @@
+plugins {
+    `maven-publish`
+}
+
+val localRepoElements by configurations.creating {
+    isCanBeConsumed = true
+    isCanBeResolved = false
+    description =
+        "Shares local maven repository directory that contains the artifacts produced by the current project"
+    attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named("maven-repository"))
+        attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+    }
+}
+
+val localRepoDir = layout.buildDirectory.dir("local-maven-repo")
+
+publishing {
+    repositories {
+        maven {
+            name = "local"
+            url = uri(localRepoDir)
+        }
+    }
+}
+
+localRepoElements.outgoing.artifact(localRepoDir) {
+    builtBy(tasks.named("publishAllPublicationsToLocalRepository"))
+}
+
+val cleanLocalRepository by tasks.registering(Delete::class) {
+    description = "Clears local-maven-repo so timestamp-based snapshot artifacts do not consume space"
+    delete(localRepoDir)
+}
+
+tasks.withType<PublishToMavenRepository>()
+    .matching { it.name.contains("ToLocalRepository") }
+    .configureEach {
+        dependsOn(cleanLocalRepository)
+    }
diff --git a/build-logic/publishing/src/main/kotlin/testng.maven-publish.gradle.kts b/build-logic/publishing/src/main/kotlin/testng.maven-publish.gradle.kts
new file mode 100644
index 0000000..5216f3f
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/testng.maven-publish.gradle.kts
@@ -0,0 +1,51 @@
+plugins {
+    `maven-publish`
+    id("testng.local-maven-repo")
+}
+
+// It takes value from root project always: https://github.com/gradle/gradle/issues/13302
+val scmUrl = providers.gradleProperty("scm.url")
+
+publishing {
+    publications {
+        withType<MavenPublication>().configureEach {
+            pom {
+                name.set(artifactId)
+                description.set(providers.provider { project.description })
+                // It takes value from root project always: https://github.com/gradle/gradle/issues/13302
+                url.set(providers.gradleProperty("project.url"))
+                licenses {
+                    license {
+                        name.set("Apache License, Version 2.0")
+                        url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                    }
+                }
+                issueManagement {
+                    system.set("Github")
+                    url.set(scmUrl.map { "${it.removeSuffix(".git")}/issues" })
+                }
+                developers {
+                    developer {
+                        id.set("cbeust")
+                        name.set("Cedric Beust")
+                        email.set("[e-mail]")
+                    }
+                    developer {
+                        id.set("juherr")
+                        name.set("Julien Herr")
+                        email.set("[e-mail]")
+                    }
+                    developer {
+                        id.set("krmahadevan")
+                        name.set("Krishnan Mahadevan")
+                        email.set("[e-mail]")
+                    }
+                }
+                scm {
+                    connection.set(scmUrl.map { "scm:git:$it" })
+                    url.set(scmUrl)
+                }
+            }
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/testng.merge-feature-jars.gradle.kts b/build-logic/publishing/src/main/kotlin/testng.merge-feature-jars.gradle.kts
new file mode 100644
index 0000000..5fc3282
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/testng.merge-feature-jars.gradle.kts
@@ -0,0 +1,160 @@
+import buildlogic.OptionalFeaturesExtension
+import buildlogic.firstLayerDependencies
+import buildlogic.javaLibrary
+import buildlogic.reconstruct
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+plugins {
+    `java-base`
+    `reporting-base`
+    id("testng.published-java-library")
+}
+
+val optionalFeatures = (the<JavaPluginExtension>() as ExtensionAware).extensions
+    .create<OptionalFeaturesExtension>("optionalFeatures", project)
+
+inline fun <reified T : Named> AttributeContainer.attribute(attr: Attribute<T>, value: String) =
+    attribute(attr, objects.named(value))
+
+val shadedDependencyElements by configurations.creating {
+    description = "Declares which modules to aggregate into ...-all.jar"
+    isCanBeConsumed = false
+    isCanBeResolved = false
+}
+
+fun Configuration.javaLibraryRuntime() = javaLibrary(objects, Usage.JAVA_RUNTIME)
+
+configurations["api"].extendsFrom(
+    firstLayerDependencies(
+        Usage.JAVA_API,
+        shadedDependencyElements
+    )
+)
+
+configurations["implementation"].extendsFrom(
+    firstLayerDependencies(
+        Usage.JAVA_RUNTIME,
+        shadedDependencyElements
+    )
+)
+
+val shadedDependencyFullRuntimeClasspath by configurations.creating {
+    description = "Resolves the list of shadedDependencyElements to testng and external dependencies"
+    isCanBeConsumed = false
+    isCanBeResolved = true
+    isVisible = false
+    extendsFrom(shadedDependencyElements)
+    javaLibraryRuntime()
+}
+
+val mergedJars by configurations.creating {
+    description = "Resolves the list of testng modules to include into -all jar"
+    isCanBeConsumed = false
+    isCanBeResolved = true
+    isTransitive = false
+    javaLibraryRuntime()
+    withDependencies {
+        // Clear any user-added-by-mistake dependencies
+        clear()
+        // Identifies TestNG projects in shadedDependencyFullRuntimeClasspath dependency tree
+        addAll(
+            shadedDependencyFullRuntimeClasspath.incoming.resolutionResult.allDependencies
+                .asSequence()
+                .filter { !it.isConstraint }
+                .filterIsInstance<ResolvedDependencyResult>()
+                .mapNotNull { resolved ->
+                    resolved.resolvedVariant
+                        .takeIf { optionalFeatures.shadedDependenciesFilter.get()(it) }
+                        ?.let { project.dependencies.reconstruct(it) }
+                }
+        )
+    }
+}
+
+val shadedDependencyJavadocClasspath by configurations.creating {
+    description = "Resolves a runtime classpath of the aggregated -all dependenices"
+    isCanBeConsumed = false
+    isCanBeResolved = true
+    isVisible = false
+    extendsFrom(mergedJars)
+    extendsFrom(configurations["compileClasspath"])
+    extendsFrom(shadedDependencyFullRuntimeClasspath)
+    javaLibraryRuntime()
+    attributes {
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, LibraryElements.JAR)
+        attribute(Bundling.BUNDLING_ATTRIBUTE, Bundling.EXTERNAL)
+    }
+}
+
+val mergedJar by tasks.registering(ShadowJar::class) {
+    group = LifecycleBasePlugin.BUILD_GROUP
+    description = "Builds all-project jar (third-party dependencies are left as is)"
+    configurations = listOf(mergedJars)
+    // Individual jars have their own license, and ShadowJar overrides "duplicateStrategy" option
+    // So we exclude LICENSE.txt from the merged jars, and let testng.java.gradle.kts to add the default one
+    exclude("META-INF/LICENSE.txt")
+    archiveClassifier.set("all")
+}
+
+dependencies {
+    "implementation"(files(mergedJar))
+}
+
+val sourcesToMerge by configurations.creating {
+    description = "Resolves the list of source directories to include into sources-all jar"
+    isCanBeConsumed = false
+    isCanBeResolved = true
+    isTransitive = false // jarsToMerge is a full set of modules, so no need to have transitivity here
+    extendsFrom(mergedJars)
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, Usage.JAVA_RUNTIME)
+        attribute(Category.CATEGORY_ATTRIBUTE, Category.DOCUMENTATION)
+        attribute(DocsType.DOCS_TYPE_ATTRIBUTE, "source-folders")
+    }
+}
+
+val mergedSourcesJar by tasks.registering(Jar::class) {
+    from(sourcesToMerge.incoming.artifactView { lenient(true) }.files)
+    archiveClassifier.set("sources-all")
+}
+
+val mergedJavadoc by tasks.registering(Javadoc::class) {
+    description = "Generates an aggregate javadoc"
+    group = LifecycleBasePlugin.BUILD_GROUP
+    setSource(sourcesToMerge.incoming.artifactView { lenient(true) }.files)
+    include("**/*.java")
+    setDestinationDir(reporting.file("mergedJavadoc"))
+    classpath = shadedDependencyJavadocClasspath
+}
+
+val mergedJavadocJar by tasks.registering(Jar::class) {
+    description = "Generates an aggregate javadoc jar"
+    group = LifecycleBasePlugin.BUILD_GROUP
+    from(mergedJavadoc)
+    archiveClassifier.set("javadoc-all")
+}
+
+// Configure merged artifacts for publication
+configurations.named("sourcesElements") {
+    artifacts.clear()
+    outgoing.artifact(mergedSourcesJar) {
+        classifier = "sources"
+    }
+}
+
+configurations.named("javadocElements") {
+    artifacts.clear()
+    outgoing.artifact(mergedJavadocJar) {
+        classifier = "javadoc"
+    }
+}
+
+for (name in listOf("apiElements", "runtimeElements")) {
+    configurations.named(name) {
+        artifacts.clear()
+        outgoing.artifact(mergedJar) {
+            classifier = null
+        }
+        outgoing.variants.removeIf { it.name == "classes" || it.name == "resources" }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/testng.published-java-library.gradle.kts b/build-logic/publishing/src/main/kotlin/testng.published-java-library.gradle.kts
new file mode 100644
index 0000000..21ff5b8
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/testng.published-java-library.gradle.kts
@@ -0,0 +1,41 @@
+import com.github.vlsi.gradle.publishing.dsl.simplifyXml
+import com.github.vlsi.gradle.publishing.dsl.versionFromResolution
+
+plugins {
+    id("testng.reproducible-builds")
+    id("testng.java-library")
+    id("testng.maven-publish")
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+dependencies {
+    // If the user adds core and api with different versions,
+    // then Gradle would select **both** core and api with the same version
+    // Note: un-comment when testng-bom is published
+    // implementation(platform(project(":testng-bom")))
+    // For some reason this can't be in code-quality/testng.testing :(
+    testImplementation(project(":testng-test-kit"))
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["java"])
+            // Gradle feature variants can't be mapped to Maven's pom
+            suppressAllPomMetadataWarnings()
+
+            // Use the resolved versions in pom.xml
+            // Gradle might have different resolution rules, so we set the versions
+            // that were used in Gradle build/test.
+            versionFromResolution()
+
+            pom {
+                simplifyXml()
+            }
+        }
+    }
+}
diff --git a/build-logic/publishing/src/main/kotlin/testng.published-java-platform.gradle.kts b/build-logic/publishing/src/main/kotlin/testng.published-java-platform.gradle.kts
new file mode 100644
index 0000000..d78cdb1
--- /dev/null
+++ b/build-logic/publishing/src/main/kotlin/testng.published-java-platform.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    id("testng.reproducible-builds")
+    id("testng.java-platform")
+    id("testng.maven-publish")
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["javaPlatform"])
+        }
+    }
+}
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
new file mode 100644
index 0000000..ee7e4ab
--- /dev/null
+++ b/build-logic/settings.gradle.kts
@@ -0,0 +1,12 @@
+dependencyResolutionManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "build-logic"
+
+include(":basics")
+include(":code-quality")
+include(":jvm")
+include(":publishing")
diff --git a/build-with-gradle b/build-with-gradle
deleted file mode 100755
index 44e73f2..0000000
--- a/build-with-gradle
+++ /dev/null
@@ -1 +0,0 @@
-./gradlew --daemon --stacktrace clean build test
diff --git a/build-with-maven b/build-with-maven
deleted file mode 100755
index a6c135a..0000000
--- a/build-with-maven
+++ /dev/null
@@ -1,25 +0,0 @@
-# Two different POMs are needed to build TestNG with Maven because it's not
-# allowed to have circular dependencies.
-# - pom.xml defines the project version "n-SNAPSHOT", builds, jars and deploys (but doesn't
-# run the tests).
-# - pom-test.xml declares a test dependency on "n-SNAPSHOT", which it will find
-# in the local repository (~/.m2/repository). All it does then is run the tests.
-
-
-mvn clean install -Dgpg.skip=true
-#or if you want to sign the jar, uncomment this:
-#mvn clean install
-
-mvn -f pom-test.xml test
-
-
-echo
-echo "To run the tests: mvn -f pom-test.xml test"
-echo "To deploy to the snapshot repository: mvn deploy"
-echo "To deploy to the release directory: mvn release:clean release:prepare release:perform"
-echo "Nexus UI:  https://oss.sonatype.org/index.html"
-echo "Wiki: https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide"
-
-# deploy without tagging: mvn deploy -DperformRelease
-
-
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 76fe5da..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,181 +0,0 @@
-buildscript {
-
-    def a_user = hasProperty('artifactory_user') ? artifactory_user : System.getenv('artifactory_user')
-    def a_password = hasProperty('artifactory_password') ? artifactory_password : System.getenv('artifactory_password')
-
-    repositories {
-        mavenCentral()
-        jcenter()
-        maven {
-            url 'http://dl.bintray.com/cbeust/maven'
-        }
-        maven {
-            url 'http://oss.jfrog.org/artifactory/plugins-release'
-            credentials {
-                username = "${a_user}"
-                password = "${a_password}"
-            }
-        }
-    }
-
-    dependencies {
-        classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
-    }
-}
-
-plugins {
-    id "com.jfrog.bintray" version "1.6"
-    id "com.jfrog.artifactory" version "4.3.0"
-    id "org.sonarqube" version "2.0.1"
-    id "nebula.optional-base" version "3.0.3"
-    id "nebula.provided-base" version "3.0.3"
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.13'
-}
-
-group = 'org.testng'
-version = '6.9.12-SNAPSHOT'
-
-apply plugin: 'java'
-apply plugin: 'groovy'
-apply plugin: 'jacoco'
-apply plugin: 'osgi'
-
-targetCompatibility = "1.7"
-sourceCompatibility = "1.7"
-
-repositories {
-    mavenCentral()
-    jcenter()
-    maven {
-        url 'http://dl.bintray.com/cbeust/maven'
-    }
-}
-
-dependencies {
-    compile 'org.beanshell:bsh:2.0b4'
-    compile 'com.beust:jcommander:1.48'
-
-    compile 'org.apache.ant:ant:1.7.0'
-    compile 'junit:junit:4.12', optional
-    compile 'org.yaml:snakeyaml:1.15', optional
-
-    provided 'com.google.inject:guice:4.0:no_aop'
-
-    testCompile 'org.assertj:assertj-core:2.0.0'
-    testCompile 'org.testng:testng:6.9.4'
-    testCompile 'org.codehaus.groovy:groovy-all:2.4.7'
-    testCompile 'org.spockframework:spock-core:1.0-groovy-2.4'
-}
-
-task sourceJar(type: Jar) {
-    group 'Build'
-    description 'An archive of the source code'
-    classifier 'sources'
-    from sourceSets.main.allSource
-}
-
-artifacts {
-    sourceJar
-}
-
-import org.apache.tools.ant.filters.ReplaceTokens
-
-def generatedSourcesFolder = projectDir.toString() + '/src/generated/java'
-
-def dirFrom = projectDir.toString() + '/src/main/resources/org/testng/internal'
-def dirTo = generatedSourcesFolder + "/org/testng/internal"
-def fileFrom = 'VersionTemplateJava'
-def fileTo = 'Version.java'
-
-task removeVersion {
-    delete dirTo + fileTo
-}
-
-sourceSets {
-    generated {
-        java {
-            srcDir 'src/generated/java'
-        }
-        resources {
-            srcDir 'src/generated/resources'
-        }
-    }
-}
-
-sourceSets {
-    main {
-        compileClasspath += generated.output
-        runtimeClasspath += generated.output
-    }
-}
-
-gradle.projectsEvaluated {
-    compileJava.dependsOn(myDir)
-}
-
-task myDir {
-    delete dirTo + "/" + fileTo
-    mkdir(dirTo)
-}
-
-// Include the generated Version.class in the jar
-jar {
-    manifest {
-        instruction 'Bundle-License', 'http://apache.org/licenses/LICENSE-2.0'
-        instruction 'Bundle-Description', 'TestNG is a testing framework.'
-        instruction 'Import-Package',
-            'bsh.*;version="[2.0.0,3.0.0)";resolution:=optional',
-            'com.beust.jcommander.*;version="[1.7.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.*',
-            '*'
-    }
-    from "$buildDir/classes/generated"
-}
-
-task createVersion(type: Copy, dependsOn: myDir) {
-    println("Creating Version file: ${version} in ${dirTo}")
-    from dirFrom
-    include fileFrom
-    into(dirTo)
-    rename(fileFrom, fileTo)
-    filter(ReplaceTokens, tokens: [version: version])
-}
-
-compileJava.dependsOn(createVersion)
-
-test {
-    useTestNG() {
-        suites 'src/test/resources/testng.xml'
-    }
-//    testLogging.showStandardStreams = true
-    systemProperties = System.getProperties()
-    systemProperties['test.resources.dir'] = 'build/resources/test/'
-}
-
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
-    }
-}
-
-sonarqube {
-    properties {
-        property "sonar.host.url", "https://nemo.sonarqube.org"
-        property "sonar.github.repository", "cbeust/testng"
-        property "sonar.github.login", "testng-bot"
-    }
-}
-
-apply from: 'gradle/publishing.gradle'
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..2c43413
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,56 @@
+plugins {
+    id("testng.repositories")
+    id("com.github.vlsi.stage-vote-release")
+    id("idea")
+}
+
+val String.v: String get() = rootProject.extra["$this.version"] as String
+val buildVersion = "testng".v + releaseParams.snapshotSuffix
+version = buildVersion
+
+println("Building testng $buildVersion")
+
+/**
+ * Release procedure:
+ *   1. ./gradlew prepareVote -Prc=1 -Pgh    (builds artifacts, stages them to Central, closes staging repository)
+ *   2. ./gradlew publishDist -Prc=1 -Pgh    (publishes staging repository and pushes release tag)
+ *
+ * See https://github.com/vlsi/vlsi-release-plugins#stage-vote-release-plugin
+ * The following properties (e.g. $HOME/.gradle/gradle.properties) configure credentials.
+ * The plugin would raise a warning if the property is not found.
+ *   signing.gnupg.keyName=...
+ *   signing.password=...
+ *   signing.secretKeyRingFile=...
+ *   ghNexusUsername=...
+ *   ghNexusPassword=...
+ *   ghGitSourceUsername=...
+ *   ghGitSourcePassword=...
+ *
+ * You can use https://github.com/vlsi/asflike-release-environment as a playground to dry run releases.
+ */
+
+fun property(name: String) =
+    providers.gradleProperty(name).forUseAtConfigurationTime()
+
+releaseParams {
+    tlp.set(property("github.repository"))
+    organizationName.set(property("github.organization"))
+    componentName.set(property("project.name"))
+    prefixForProperties.set("gh")
+    svnDistEnabled.set(false)
+    sitePreviewEnabled.set(false)
+    releaseTag.set(buildVersion) // or "testng-$buildVersion"
+    nexus {
+        packageGroup.set(property("nexus.profile"))
+        mavenCentral()
+    }
+    voteText.set {
+        """
+        ${it.componentName} v${it.version}-rc${it.rc} is ready for preview.
+
+        Git SHA: ${it.gitSha}
+        Staging repository: ${it.nexusRepositoryUri}
+        """.trimIndent()
+    }
+}
+
diff --git a/bundle-pom.xml b/bundle-pom.xml
deleted file mode 100644
index c969d80..0000000
--- a/bundle-pom.xml
+++ /dev/null
@@ -1,59 +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">
-    <!--
-    This POM cannot be used to build TestNG; it should only be used as part of a Maven
-    repository upload bundle.
-    
-    See the guide to creating a bundle here:
-    http://maven.apache.org/guides/mini/guide-central-repository-upload.html
-    -->
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.testng</groupId>
-    <artifactId>testng</artifactId>
-    <name>TestNG</name>
-    <version>5.12.1</version>
-    <description>TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.</description>
-    <url>http://testng.org</url>
-    
-    <licenses>
-        <license>
-            <name>Apache License, Version 2.0</name>
-            <url>http://apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:svn:http://testng.googlecode.com/svn/trunk/</connection>
-        <developerConnection>scm:svn:http://testng.googlecode.com/svn/trunk/</developerConnection>
-        <url>http://testng.googlecode.com/svn/trunk</url>
-    </scm>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.7.0</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.beanshell</groupId>
-            <artifactId>bsh</artifactId>
-            <version>2.0b4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.google.inject</groupId>
-           <artifactId>guice</artifactId>
-           <version>2.0</version>
-           <scope>provided</scope>
-        </dependency>
-
-    </dependencies>    
-    
-</project>
diff --git a/debian/changelog b/debian/changelog
index 3f49da0..26365df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+testng7 (7.5~us1-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release 7.5, packaged as a separate source and binary,
+    required for jtreg version 6 and 7 (LP: #2012320).
+  * d/p/build-with-gradle.patch: provide Groovy Gradle build.
+
+ -- Vladimir Petko <[e-mail]>  Wed, 22 Mar 2023 16:42:42 +1300
+
 testng (6.9.12-4) unstable; urgency=medium
 
   * Team upload.
@@ -156,8 +164,8 @@ testng (5.11+dfsg-3) unstable; urgency=low
 testng (5.11+dfsg-2ubuntu2) oneiric; urgency=low
 
   * Fix FTBFS (LP: #829508):
-    - d/patches/debian/junitconvertor-test-fix.diff: Switch from use of 
-      deprecated parameters attribute in @Test to using @Parameters to 
+    - d/patches/debian/junitconvertor-test-fix.diff: Switch from use of
+      deprecated parameters attribute in @Test to using @Parameters to
       ensure that JUnitConvertor Test passes.
 
  -- James Page <[e-mail]>  Tue, 20 Sep 2011 12:15:27 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 78776a3..f8100d4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,12 @@
-Source: testng
+Source: testng7
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
-Uploaders: Eugene Zhukov <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
+Uploaders: Eugene Zhukov <[e-mail]>, Vladimir Petko <[e-mail]>
 Build-Depends:
  ant,
- debhelper (>= 11~),
+ debhelper-compat (=13),
  default-jdk,
  junit4,
  libbsh-java,
@@ -14,16 +15,20 @@ Build-Depends:
  libjcommander-java,
  libmaven-bundle-plugin-java,
  libyaml-snake-java,
- maven-debian-helper
-Standards-Version: 4.1.5
+ maven-repo-helper,
+ gradle-debian-helper,
+ libassertj-core-java
+Rules-Requires-Root: no
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/testng.git
 Vcs-Browser: https://salsa.debian.org/java-team/testng
 Homepage: http://testng.org
 
-Package: testng
+Package: libtestng7-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
+Conflicts: testng
 Description: testing framework for Java
  TestNG is a testing framework inspired from JUnit and NUnit but introducing
  some new functionalities that make it more powerful and easier to use, such as:
diff --git a/debian/copyright b/debian/copyright
index 78e2f32..8ee2d51 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Files-Excluded:
+  .gitignore
+  .gitattributes
+  .github/*
+  gradle/*
+Comment: Exclude github artifacts, .gitignore, .gitattributes and gradle wrapper
 Upstream-Name: TestNG
 Source: http://testng.org
 
@@ -8,6 +14,7 @@ License: Apache-2.0
 
 Files: debian/*
 Copyright: 2013, Eugene Zhukov <[e-mail]>
+           2023, Canonical Ltd.
 License: Apache-2.0
 
 License: Apache-2.0
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 0becd6d..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[import-orig]
-upstream-vcs-tag = testng-%(version)s
diff --git a/debian/testng.poms b/debian/libtestng7-java.poms
similarity index 94%
rename from debian/testng.poms
rename to debian/libtestng7-java.poms
index 77fc769..8640402 100644
--- a/debian/testng.poms
+++ b/debian/libtestng7-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version --java-lib --relocate=org.testng:testng:6.x
+build/debian/testng.pom --artifact=build/libs/testng-*.jar --java-lib --relocate=org.testng:testng:7.x
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 5c21bbc..43e63ca 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -5,4 +5,3 @@ org.apache.maven.plugins maven-javadoc-plugin * * * *
 org.apache.maven.plugins maven-release-plugin * * * *
 org.apache.maven.plugins maven-source-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
-org.assertj assertj-core * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 9f41d8b..45a3b3e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -4,3 +4,4 @@ junit junit jar s/4\..*/4.x/ * *
 org.yaml snakeyaml bundle s/1\..*/1.x/ * *
 org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
+org.assertj assertj-core jar s/.*/debian/ * *
diff --git a/debian/missing-sources/jquery-1.7.1.js b/debian/missing-sources/jquery-1.7.1.js
deleted file mode 100644
index 8ccd0ea..0000000
--- a/debian/missing-sources/jquery-1.7.1.js
+++ /dev/null
@@ -1,9266 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.7.1
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Mon Nov 21 21:11:03 2011 -0500
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-	navigator = window.navigator,
-	location = window.location;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-
-	// Used for trimming whitespace
-	trimLeft = /^\s+/,
-	trimRight = /\s+$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
-	// Useragent RegExp
-	rwebkit = /(webkit)[ \/]([\w.]+)/,
-	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-	rmsie = /(msie) ([\w.]+)/,
-	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
-	// Matches dashed string for camelizing
-	rdashAlpha = /-([a-z]|[0-9])/ig,
-	rmsPrefix = /^-ms-/,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return ( letter + "" ).toUpperCase();
-	},
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	trim = String.prototype.trim,
-	indexOf = Array.prototype.indexOf,
-
-	// [[Class]] -> type pairs
-	class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context && document.body ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = quickExpr.exec( selector );
-			}
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = ( context ? context.ownerDocument || context : document );
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
-					}
-
-					return jQuery.merge( this, selector );
-
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.7.1",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = this.constructor();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// Add the callback
-		readyList.add( fn );
-
-		return this;
-	},
-
-	eq: function( i ) {
-		i = +i;
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-		// Either a released hold or an DOMready/load event and not yet ready
-		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 1 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If a normal DOM Ready event fired, decrement, and wait if need be
-			if ( wait !== true && --jQuery.readyWait > 0 ) {
-				return;
-			}
-
-			// If there are functions bound, to execute
-			readyList.fireWith( document, [ jQuery ] );
-
-			// Trigger any bound ready events
-			if ( jQuery.fn.trigger ) {
-				jQuery( document ).trigger( "ready" ).off( "ready" );
-			}
-		}
-	},
-
-	bindReady: function() {
-		if ( readyList ) {
-			return;
-		}
-
-		readyList = jQuery.Callbacks( "once memory" );
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	// A crude way of determining if an object is a window
-	isWindow: function( obj ) {
-		return obj && typeof obj === "object" && "setInterval" in obj;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call(obj, "constructor") &&
-				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
-
-			return ( new Function( "return " + data ) )();
-
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction( object );
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return object;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: trim ?
-		function( text ) {
-			return text == null ?
-				"" :
-				trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			var type = jQuery.type( array );
-
-			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array, i ) {
-		var len;
-
-		if ( array ) {
-			if ( indexOf ) {
-				return indexOf.call( array, elem, i );
-			}
-
-			len = array.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in array && array[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length,
-			j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [], retVal;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value, key, ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		if ( typeof context === "string" ) {
-			var tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		var args = slice.call( arguments, 2 ),
-			proxy = function() {
-				return fn.apply( context, args.concat( slice.call( arguments ) ) );
-			};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Mutifunctional method to get and set values to a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, key, value, exec, fn, pass ) {
-		var length = elems.length;
-
-		// Setting many attributes
-		if ( typeof key === "object" ) {
-			for ( var k in key ) {
-				jQuery.access( elems, k, key[k], exec, fn, value );
-			}
-			return elems;
-		}
-
-		// Setting one attribute
-		if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = !pass && exec && jQuery.isFunction(value);
-
-			for ( var i = 0; i < length; i++ ) {
-				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-			}
-
-			return elems;
-		}
-
-		// Getting an attribute
-		return length ? fn( elems[0], key ) : undefined;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	sub: function() {
-		function jQuerySub( selector, context ) {
-			return new jQuerySub.fn.init( selector, context );
-		}
-		jQuery.extend( true, jQuerySub, this );
-		jQuerySub.superclass = this;
-		jQuerySub.fn = jQuerySub.prototype = this();
-		jQuerySub.fn.constructor = jQuerySub;
-		jQuerySub.sub = this.sub;
-		jQuerySub.fn.init = function init( selector, context ) {
-			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-				context = jQuerySub( context );
-			}
-
-			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-		};
-		jQuerySub.fn.init.prototype = jQuerySub.fn;
-		var rootjQuerySub = jQuerySub(document);
-		return jQuerySub;
-	},
-
-	browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-// IE doesn't match non-breaking spaces with \s
-if ( rnotwhite.test( "\xA0" ) ) {
-	trimLeft = /^[\s\xA0]+/;
-	trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch(e) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-return jQuery;
-
-})();
-
-
-// String to Object flags format cache
-var flagsCache = {};
-
-// Convert String-formatted flags into Object-formatted ones and store in cache
-function createFlags( flags ) {
-	var object = flagsCache[ flags ] = {},
-		i, length;
-	flags = flags.split( /\s+/ );
-	for ( i = 0, length = flags.length; i < length; i++ ) {
-		object[ flags[i] ] = true;
-	}
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	flags:	an optional list of space-separated flags that will change how
- *			the callback list behaves
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible flags:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( flags ) {
-
-	// Convert flags from String-formatted to Object-formatted
-	// (we check in cache first)
-	flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {};
-
-	var // Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = [],
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Add one or several callbacks to the list
-		add = function( args ) {
-			var i,
-				length,
-				elem,
-				type,
-				actual;
-			for ( i = 0, length = args.length; i < length; i++ ) {
-				elem = args[ i ];
-				type = jQuery.type( elem );
-				if ( type === "array" ) {
-					// Inspect recursively
-					add( elem );
-				} else if ( type === "function" ) {
-					// Add if not in unique mode and callback is not in
-					if ( !flags.unique || !self.has( elem ) ) {
-						list.push( elem );
-					}
-				}
-			}
-		},
-		// Fire callbacks
-		fire = function( context, args ) {
-			args = args || [];
-			memory = !flags.memory || [ context, args ];
-			firing = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) {
-					memory = true; // Mark as halted
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( !flags.once ) {
-					if ( stack && stack.length ) {
-						memory = stack.shift();
-						self.fireWith( memory[ 0 ], memory[ 1 ] );
-					}
-				} else if ( memory === true ) {
-					self.disable();
-				} else {
-					list = [];
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					var length = list.length;
-					add( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away, unless previous
-					// firing was halted (stopOnFalse)
-					} else if ( memory && memory !== true ) {
-						firingStart = length;
-						fire( memory[ 0 ], memory[ 1 ] );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					var args = arguments,
-						argIndex = 0,
-						argLength = args.length;
-					for ( ; argIndex < argLength ; argIndex++ ) {
-						for ( var i = 0; i < list.length; i++ ) {
-							if ( args[ argIndex ] === list[ i ] ) {
-								// Handle firingIndex and firingLength
-								if ( firing ) {
-									if ( i <= firingLength ) {
-										firingLength--;
-										if ( i <= firingIndex ) {
-											firingIndex--;
-										}
-									}
-								}
-								// Remove the element
-								list.splice( i--, 1 );
-								// If we have some unicity property then
-								// we only need to do this once
-								if ( flags.unique ) {
-									break;
-								}
-							}
-						}
-					}
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				if ( list ) {
-					var i = 0,
-						length = list.length;
-					for ( ; i < length; i++ ) {
-						if ( fn === list[ i ] ) {
-							return true;
-						}
-					}
-				}
-				return false;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},