Author: maartenc Date: Mon Mar 22 20:13:12 2010 New Revision: 926307 URL: http://svn.apache.org/viewvc?rev=926307&view=rev Log: Little code cleanup
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=926307&r1=926306&r2=926307&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Mon Mar 22 20:13:12 2010 @@ -54,7 +54,6 @@ import org.apache.ivy.plugins.circular.C import org.apache.ivy.plugins.circular.ErrorCircularDependencyStrategy; import org.apache.ivy.plugins.circular.IgnoreCircularDependencyStrategy; import org.apache.ivy.plugins.circular.WarnCircularDependencyStrategy; -import org.apache.ivy.plugins.conflict.LatestCompatibleConflictManager; import org.apache.ivy.plugins.conflict.StrictConflictException; import org.apache.ivy.plugins.matcher.ExactPatternMatcher; import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser; @@ -5016,7 +5015,7 @@ public class ResolveTest extends TestCas public void testIVY956() throws Exception { ivy.getSettings().setDefaultConflictManager(ivy.getSettings().getConflictManager("latest-compatible")); try { - ResolveReport report = ivy.resolve(ResolveTest.class.getResource("ivy-956.xml"), + ivy.resolve(ResolveTest.class.getResource("ivy-956.xml"), getResolveOptions(ivy.getSettings(), new String[] {"*"}).setValidate(false)); fail("No StrictConflictException has been thrown"); } catch (StrictConflictException e) {