[testng] 240/355: Fix #310

[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 78c26497facbfe6c7bf54fc2b444fa53f527b785
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Wed Apr 29 11:22:55 2015 +0200

    Fix #310
---
 CHANGES.txt | 1 +
 pom.xml     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7384263..294c15e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,7 @@ Fixed: GITHUB-353: Typo in documentation (Jan Święcki)
 Fixed: GITHUB-656: Upgrade to JCommander 1.48 (Ryan Schmitt)
 Fixed: GITHUB-582: TestNG tests don't pass reliably on JDK8 (Ryan Schmitt)
 New: GITHUB-645: TestNG project on Google Code redirect to GitHub
+Fixed: GITHUB-310: Upgrade Guice (kronar & Julien Herr)
 
 6.8.21:
 2015/02/02
diff --git a/pom.xml b/pom.xml
index f650cf8..829625b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,8 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>2.0</version>
+      <version>4.0</version>
+      <classifier>no_aop</classifier>
       <scope>provided</scope>
     </dependency>
 

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