Author: dkulp Date: Wed Nov 28 20:38:58 2012 New Revision: 1414909 URL: http://svn.apache.org/viewvc?rev=1414909&view=rev Log: Merged revisions 1414319 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1414319 | dkulp | 2012-11-27 14:09:49 -0500 (Tue, 27 Nov 2012) | 10 lines Merged revisions 1414289 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1414289 | dkulp | 2012-11-27 12:57:52 -0500 (Tue, 27 Nov 2012) | 2 lines Lock down maven-war-plugin version as 2.3 has issues on Mac. ........ ........ 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=1414909&r1=1414908&r2=1414909&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/pom.xml (original) +++ cxf/branches/2.5.x-fixes/pom.xml Wed Nov 28 20:38:58 2012 @@ -504,6 +504,11 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>2.3.1</version> </plugin>
