[testng] 256/355: Merge pull request #671 from juherr/issue-travis

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit 33658e092e2ea113f39cf5e585d81142651d8dd9
Merge: cd97c53 f96908d
Author: Cedric Beust <cedric at beust.com>
Date:   Sun May 3 18:39:30 2015 -0700

    Merge pull request #671 from juherr/issue-travis
    
    Fix regression of #667

 pom-test.xml                                       |  6 +++
 pom.xml                                            |  6 +++
 src/main/java/org/testng/TestRunner.java           |  2 +-
 .../java/org/testng/internal/BaseClassFinder.java  |  2 +-
 .../java/org/testng/internal/ClassInfoMap.java     |  2 +-
 .../annotations/JDK15AnnotationFinder.java         | 27 +++++-------
 .../AnnotationTransformerSampleTest.java           | 19 --------
 .../AnnotationTransformerTest.java                 | 50 +++++++++++++++++-----
 .../test/annotationtransformer/MyTransformer.java  | 34 ++++++++-------
 .../InvokedMethodListenerTest.java                 |  1 -
 10 files changed, 83 insertions(+), 66 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git