Merge branch 'master' of github.com:cbeust/testng
diff --git a/README.dev b/README.dev
index 6832b8b..a26a7e9 100644
--- a/README.dev
+++ b/README.dev
@@ -6,7 +6,12 @@
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>
diff --git a/src/main/java/org/testng/TestRunner.java b/src/main/java/org/testng/TestRunner.java
index 840f639..6ff72f5 100644
--- a/src/main/java/org/testng/TestRunner.java
+++ b/src/main/java/org/testng/TestRunner.java
@@ -1,12 +1,41 @@
package org.testng;
-import com.google.inject.Injector;
-import com.google.inject.Module;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
import org.testng.collections.ListMultiMap;
import org.testng.collections.Lists;
import org.testng.collections.Maps;
-import org.testng.internal.*;
+import org.testng.internal.Attributes;
+import org.testng.internal.ClassHelper;
+import org.testng.internal.ClassInfoMap;
+import org.testng.internal.ConfigurationGroupMethods;
+import org.testng.internal.Constants;
+import org.testng.internal.DynamicGraph;
import org.testng.internal.DynamicGraph.Status;
+import org.testng.internal.IConfiguration;
+import org.testng.internal.IInvoker;
+import org.testng.internal.ITestResultNotifier;
+import org.testng.internal.InvokedMethod;
+import org.testng.internal.Invoker;
+import org.testng.internal.MethodGroupsHelper;
+import org.testng.internal.MethodHelper;
+import org.testng.internal.MethodInstance;
+import org.testng.internal.ResultMap;
+import org.testng.internal.RunInfo;
+import org.testng.internal.TestMethodWorker;
+import org.testng.internal.TestNGClassFinder;
+import org.testng.internal.TestNGMethodFinder;
+import org.testng.internal.Utils;
import org.testng.internal.XmlMethodSelector;
import org.testng.internal.annotations.IAnnotationFinder;
import org.testng.internal.annotations.IListeners;
@@ -16,11 +45,14 @@
import org.testng.internal.thread.graph.IThreadWorkerFactory;
import org.testng.internal.thread.graph.IWorker;
import org.testng.junit.IJUnitTestRunner;
-import org.testng.xml.*;
+import org.testng.xml.XmlClass;
+import org.testng.xml.XmlInclude;
+import org.testng.xml.XmlPackage;
+import org.testng.xml.XmlSuite;
+import org.testng.xml.XmlTest;
-import java.util.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
+import com.google.inject.Injector;
+import com.google.inject.Module;
/**
* This class takes care of running one Test.
diff --git a/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java b/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java
index 0b45d83..c313774 100755
--- a/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java
+++ b/src/main/java/org/testng/internal/annotations/JDK15AnnotationFinder.java
@@ -1,16 +1,43 @@
package org.testng.internal.annotations;
-import org.testng.IAnnotationTransformer;
-import org.testng.IAnnotationTransformer2;
-import org.testng.annotations.*;
-import org.testng.collections.Maps;
-import org.testng.internal.collections.Pair;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.Map;
+import org.testng.IAnnotationTransformer;
+import org.testng.IAnnotationTransformer2;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Configuration;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.ExpectedExceptions;
+import org.testng.annotations.Factory;
+import org.testng.annotations.IAnnotation;
+import org.testng.annotations.IConfigurationAnnotation;
+import org.testng.annotations.IDataProviderAnnotation;
+import org.testng.annotations.IExpectedExceptionsAnnotation;
+import org.testng.annotations.IFactoryAnnotation;
+import org.testng.annotations.IObjectFactoryAnnotation;
+import org.testng.annotations.IParametersAnnotation;
+import org.testng.annotations.ITestAnnotation;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.ObjectFactory;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+import org.testng.annotations.TestInstance;
+import org.testng.collections.Maps;
+import org.testng.internal.collections.Pair;
+
/**
* This class implements IAnnotationFinder with JDK5 annotations
*
diff --git a/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java b/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java
index 56b110b..2773460 100755
--- a/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java
+++ b/src/main/java/org/testng/internal/annotations/JDK15TagFactory.java
@@ -1,15 +1,39 @@
package org.testng.internal.annotations;
-import org.testng.IAnnotationTransformer;
-import org.testng.TestNGException;
-import org.testng.annotations.*;
-import org.testng.collections.Maps;
-import org.testng.internal.Utils;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Map;
+import org.testng.IAnnotationTransformer;
+import org.testng.TestNGException;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Configuration;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.ExpectedExceptions;
+import org.testng.annotations.Factory;
+import org.testng.annotations.IAnnotation;
+import org.testng.annotations.IConfigurationAnnotation;
+import org.testng.annotations.IDataProviderAnnotation;
+import org.testng.annotations.IExpectedExceptionsAnnotation;
+import org.testng.annotations.IFactoryAnnotation;
+import org.testng.annotations.IObjectFactoryAnnotation;
+import org.testng.annotations.IParametersAnnotation;
+import org.testng.annotations.ITestAnnotation;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+import org.testng.collections.Maps;
+import org.testng.internal.Utils;
+
/**
* This class creates implementations of IAnnotations based on the JDK5
* annotation that was found on the Java element.
