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 4c300485a78d69dbf37607f86c1c1f0d9e6c3e04 Merge: 8a074ce d384cee Author: Cedric Beust <[email protected]> Date: Thu May 21 18:33:27 2015 -0700 Merge branch 'master' of github.com:cbeust/testng Conflicts: CHANGES.txt CHANGES.txt | 3 + doc/documentation-main.html | 7 +- gigaspaces/.classpath | 12 - gigaspaces/.project | 17 -- gigaspaces/3rdparty/JSpaces.jar | Bin 5446503 -> 0 bytes .../3rdparty/common/backport-util-concurrent.jar | Bin 327810 -> 0 bytes gigaspaces/3rdparty/jini/jsk-lib.jar | Bin 291877 -> 0 bytes gigaspaces/3rdparty/jini/jsk-platform.jar | Bin 995179 -> 0 bytes gigaspaces/build.xml | 101 ------- .../src/org/testng/gigaspaces/ResultEntry.java | 44 --- .../org/testng/gigaspaces/SpaceMasterAdapter.java | 153 ---------- .../org/testng/gigaspaces/SpaceWorkerAdapter.java | 113 ------- .../src/org/testng/gigaspaces/SuiteEntry.java | 59 ---- .../test/src/test/gigaspaces/DistributedTest.java | 171 ----------- gigaspaces/test/src/test/gigaspaces/Test1.java | 15 - gigaspaces/test/src/test/gigaspaces/Test2.java | 14 - spring/.classpath | 15 - spring/.cvsignore | 3 - spring/.project | 17 -- spring/3rdparty/commons-logging-1.0.4.jar | Bin 38015 -> 0 bytes spring/3rdparty/spring-mock.jar | Bin 99358 -> 0 bytes spring/3rdparty/spring.jar | Bin 2593850 -> 0 bytes spring/LICENSE.txt | 201 ------------- spring/README.TXT | 23 -- spring/build.xml | 94 ------ ...tractDependencyInjectionSpringContextTests.java | 259 ---------------- .../spring/test/AbstractSpringContextTests.java | 140 --------- ...tTransactionalDataSourceSpringContextTests.java | 175 ----------- .../AbstractTransactionalSpringContextTests.java | 328 --------------------- .../src/common/org/testng/spring/test/package.html | 14 - .../test/AbstractSingleSpringContextTests.java | 192 ------------ .../AbstractAnnotationAwareTransactionalTests.java | 67 ----- .../test/AbstractSingleSpringContextTests.java | 194 ------------ src/main/java/org/testng/TestRunner.java | 2 +- .../java/org/testng/internal/BaseClassFinder.java | 2 +- .../java/org/testng/internal/ClassInfoMap.java | 2 +- src/main/java/org/testng/internal/Invoker.java | 12 +- .../annotations/JDK15AnnotationFinder.java | 12 +- src/main/resources/testng-1.0.dtd | 5 +- .../AnnotationTransformerTest.java | 20 ++ .../annotationtransformer/MyParamTransformer.java | 30 ++ src/test/java/test/enable/A.java | 28 ++ src/test/java/test/enable/B.java | 28 ++ src/test/java/test/enable/C.java | 28 ++ src/test/java/test/enable/EnableTest.java | 49 +-- .../java/test/enable/Issue420BaseTestCase.java | 19 ++ src/test/java/test/enable/Issue420FirstSample.java | 10 + .../java/test/enable/Issue420SecondSample.java | 10 + 48 files changed, 227 insertions(+), 2461 deletions(-) diff --cc CHANGES.txt index b9a155c,fdef559..0d5b260 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -2,11 -2,10 +2,13 @@@ Curren Fixed: The ServiceLoaderTest on Windows (Mathieu Sebire) Fixed: GITHUB-691: Fix classloading issue when using TestNG 6.9.4 and JMockit. (Mathieu Sebire) + Fixed: GITHUB-686: IAnnotationTransformer.transform is called for methods with testClass populated. (Łukasz Rekucki & Julien Herr) + Fixed: GITHUB-420: Before/AfterSuite methods may not run, when use inheritance, and enabled=false (Jakub Tokaj & Julien Herr) -=========================================================================== +Eclipse: + +Fixed: The 57% freeze bug (Patrick Hensley and @denyska) + 6.9.4: 2015/05/09 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
