Author: jdcasey Date: Mon Jul 14 09:58:38 2008 New Revision: 676645 URL: http://svn.apache.org/viewvc?rev=676645&view=rev Log: Update to exclude ant:ant-* and include org.apache.ant:ant-*, forcing the exclusion from plexus-ant-factory.
Modified: maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml Modified: maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml?rev=676645&r1=676644&r2=676645&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml (original) +++ maven/components/branches/maven-2.0.10-RC/maven-script/maven-script-ant/pom.xml Mon Jul 14 09:58:38 2008 @@ -1,7 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> - - - +<?xml version="1.0" encoding="UTF-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -20,10 +17,7 @@ specific language governing permissions and limitations under the License. --> - - - -<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>maven-script</artifactId> <groupId>org.apache.maven</groupId> @@ -34,6 +28,16 @@ <name>Maven Ant Mojo Support</name> <dependencies> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.7.1</version> + </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> </dependency> @@ -41,6 +45,19 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-ant-factory</artifactId> <version>1.0-alpha-2</version> + <!-- We need to exclude this artifact's dependency on Ant, --> + <!-- because it has a different groupId that the version of Ant --> + <!-- we want to use now. --> + <exclusions> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant-launcher</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -48,4 +65,3 @@ </dependency> </dependencies> </project> -