Author: brett Date: Mon May 23 22:51:01 2005 New Revision: 178082 URL: http://svn.apache.org/viewcvs?rev=178082&view=rev Log: remove unused commons-graph dependency, update to latest ant release
Removed: maven/maven-1/core/trunk/src/java/org/apache/maven/jelly/tags/maven/GraphDependencyResolver.java Modified: maven/maven-1/core/trunk/project.xml maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java Modified: maven/maven-1/core/trunk/project.xml URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/project.xml?rev=178082&r1=178081&r2=178082&view=diff ============================================================================== --- maven/maven-1/core/trunk/project.xml (original) +++ maven/maven-1/core/trunk/project.xml Mon May 23 22:51:01 2005 @@ -460,25 +460,25 @@ </dependency> <dependency> <id>ant</id> - <version>1.6.3</version> + <version>1.6.4</version> <url>http://ant.apache.org/</url> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-junit</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <url>http://ant.apache.org/</url> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-launcher</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <url>http://ant.apache.org/</url> </dependency> <dependency> <groupId>ant</groupId> <artifactId>ant-trax</artifactId> - <version>1.6.3</version> + <version>1.6.4</version> <url>http://ant.apache.org/</url> </dependency> <!-- TODO: can be removed? --> @@ -516,12 +516,6 @@ <artifactId>commons-jelly-tags-xml</artifactId> <version>1.1-SNAPSHOT</version> <url>http://jakarta.apache.org/commons/jelly/tags/xml/</url> - </dependency> -<!-- TODO: can be removed? --> - <dependency> - <id>commons-graph</id> - <version>0.8.1</version> - <url>http://jakarta.apache.org/commons/sandbox/graph/</url> </dependency> <dependency> <id>commons-jexl</id> Modified: maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java URL: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java?rev=178082&r1=178081&r2=178082&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java (original) +++ maven/maven-1/core/trunk/src/test/java/org/apache/maven/jelly/tags/maven/DependencyResolverTest.java Mon May 23 22:51:01 2005 @@ -29,38 +29,33 @@ * @version $Id$ */ public class DependencyResolverTest extends TestCase { - + private WerkzDependencyResolver dri; + public void testSimple1() throws Exception { List projects = DependencyResolverTestData.getTestSimple1(); - testSimple1Source(new GraphDependencyResolver(), projects); - testSimple1Binary(new GraphDependencyResolver(), projects); - testSimple1Source(new WerkzDependencyResolver(), projects); - testSimple1Binary(new WerkzDependencyResolver(), projects); + testSimple1Source(dri, projects); + testSimple1Binary(dri, projects); } public void testSimple2() throws Exception { List projects = DependencyResolverTestData.getTestSimple2(); - testSimple2(new GraphDependencyResolver(), projects); - testSimple2(new WerkzDependencyResolver(), projects); + testSimple2(dri, projects); } public void testSimple3() throws Exception { List projects = DependencyResolverTestData.getTestSimple3(); - testSimple3(new GraphDependencyResolver(), projects); - testSimple3(new WerkzDependencyResolver(), projects); + testSimple3(dri, projects); } public void testComplex() throws Exception { List projects = DependencyResolverTestData.getTestComplex(); - testComplex(new GraphDependencyResolver(), projects); - testComplex(new WerkzDependencyResolver(), projects); + testComplex(dri, projects); } public void testCycle() throws Exception { List projects = DependencyResolverTestData.getTestCycle(); - testCycle(new GraphDependencyResolver(), projects); - testCycle(new WerkzDependencyResolver(), projects); + testCycle(dri, projects); } public void testCycle(DependencyResolverInterface dri, List projects) throws Exception { @@ -201,4 +196,9 @@ return buf.toString(); } + protected void setUp() throws Exception + { + super.setUp(); + dri = new WerkzDependencyResolver(); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]