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 5908b970e015b5c3ba977930e29acdf62016fb55 Merge: f706670 7940da3 Author: Julien Herr <[email protected]> Date: Thu May 21 18:11:29 2015 +0200 Merge remote-tracking branch 'origin/master' into issue-420 Conflicts: CHANGES.txt .gitignore | 28 ++-- .travis.yml | 4 +- CHANGES.txt | 2 + build-with-gradle | 1 + build.gradle | 108 ++++++++++++++ doc/documentation-main.html | 7 +- gradle/buildWithTravis.sh | 1 + gradle/publishing.gradle | 58 ++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 52141 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 +++++++++++++++++++++ gradlew.bat | 90 +++++++++++ local.properties | 6 + pom.xml | 23 ++- .../java/org/testng/internal/VersionTemplateJava} | 2 +- src/main/java/org/testng/TestNG.java | 5 +- .../internal/{Version.java => VersionTemplateJava} | 2 +- src/main/resources/testng-1.0.dtd | 5 +- .../java/test/serviceloader/ServiceLoaderTest.java | 13 +- 19 files changed, 494 insertions(+), 31 deletions(-) diff --cc CHANGES.txt index 75e2410,ab27b7d..0200e43 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,8 +1,10 @@@ Current + 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-420: Before/AfterSuite methods may not run, when use inheritance, and enabled=false (Jakub Tokaj & Julien Herr) +=========================================================================== 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
