Author: dkulp Date: Thu Jun 14 16:43:16 2012 New Revision: 1350326 URL: http://svn.apache.org/viewvc?rev=1350326&view=rev Log: Merged revisions 1349552 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1349552 | dkulp | 2012-06-12 17:40:36 -0400 (Tue, 12 Jun 2012) | 10 lines Merged revisions 1349549 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1349549 | dkulp | 2012-06-12 17:36:32 -0400 (Tue, 12 Jun 2012) | 2 lines Update to latest antrun plugin ........ ........ Modified: cxf/branches/2.5.x-fixes/pom.xml Modified: cxf/branches/2.5.x-fixes/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/pom.xml?rev=1350326&r1=1350325&r2=1350326&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/pom.xml (original) +++ cxf/branches/2.5.x-fixes/pom.xml Thu Jun 14 16:43:16 2012 @@ -279,7 +279,7 @@ <id>setup.workspace</id> <phase>validate</phase> <configuration> - <tasks> + <target> <path id="ecp.ws.path" location="${eclipse.workspace.dir}" /> <property name="full.eclipse.workspace" refid="ecp.ws.path" /> @@ -358,7 +358,7 @@ <entry key="eclipse.preferences.version" value="1" /> <entry key="org.eclipse.wst.sse.ui.custom_templates" value="${eclipse.xml.templates}" /> </propertyfile> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -561,7 +561,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> + <version>1.7</version> <dependencies> <dependency> <groupId>ant-contrib</groupId>
