I don't think merging changes to ant-tasks/trunk is worth the effort now. Trunk was created in r524632, in april 2007, when Maven 2.0.x and Maven 2.1.x started 2 different branches. Changes were done by Jason in ant-tasks/trunk to match Maven 2.1.x structural changes, but AFAIK they stopped when Maven 2.1 was renamed to Maven 3, and maven-artifact replaced with Mercury, maven-ant-tasks being replaced by mercury-ant-tasks.
IMHO, ant-tasks/trunk is in a state that can't do anything useful now. Any objection if I delete ant-tasks/trunk? When Maven Ant Tasks 2.0.10 will be released, it will be time to recreate ant-tasks/trunk to match Maven 2.1.0 core. Regards, Hervé Le jeudi 30 avril 2009, [email protected] a écrit : > Author: pgier > Date: Wed Apr 29 23:14:02 2009 > New Revision: 769988 > > URL: http://svn.apache.org/viewvc?rev=769988&view=rev > Log: > Get the ant tasks building. > > Modified: > maven/ant-tasks/trunk/pom.xml > > maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA >rtifactTask.java > > Modified: maven/ant-tasks/trunk/pom.xml > URL: > http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=769988&r1=76 >9987&r2=769988&view=diff > =========================================================================== >=== --- maven/ant-tasks/trunk/pom.xml (original) > +++ maven/ant-tasks/trunk/pom.xml Wed Apr 29 23:14:02 2009 > @@ -44,8 +44,8 @@ > </issueManagement> > > <properties> > - <mavenVersion>2.1-SNAPSHOT</mavenVersion> > - <artifactVersion>3.0-SNAPSHOT</artifactVersion> > + <mavenVersion>2.1.0</mavenVersion> > + <artifactVersion>2.1.0</artifactVersion> > <junitVersion>3.8.1</junitVersion> > <plexusVersion>1.0-alpha-48</plexusVersion> > <plexusUtilsVersion>1.5.4</plexusUtilsVersion> > @@ -87,7 +87,7 @@ > <version>1.6.2</version> > </dependency> > <dependency> > - <groupId>org.apache.maven.artifact</groupId> > + <groupId>org.apache.maven</groupId> > <artifactId>maven-artifact</artifactId> > <version>${artifactVersion}</version> > </dependency> > > Modified: > maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA >rtifactTask.java URL: > http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache >/maven/artifact/ant/AbstractArtifactTask.java?rev=769988&r1=769987&r2=769988 >&view=diff > =========================================================================== >=== --- > maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA >rtifactTask.java (original) +++ > maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA >rtifactTask.java Wed Apr 29 23:14:02 2009 @@ -281,7 +281,7 @@ > settings.setLocalRepository( location ); > } > > - profileManager = new DefaultProfileManager( getContainer(), null > ); + profileManager = new DefaultProfileManager( getContainer(), > getSettings(), System.getProperties() ); > > WagonManager wagonManager = (WagonManager) lookup( > WagonManager.ROLE ); wagonManager.setDownloadMonitor( new > AntDownloadMonitor() ); @@ -539,7 +539,7 @@ > MavenProject mavenProject; > try > { > - mavenProject = projectBuilder.buildStandaloneSuperProject(); > + mavenProject = projectBuilder.buildStandaloneSuperProject( > localArtifactRepository, getProfileManager() ); } > catch ( ProjectBuildingException e ) > { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
