Author: dkulp Date: Fri May 11 17:41:50 2012 New Revision: 1337306 URL: http://svn.apache.org/viewvc?rev=1337306&view=rev Log: Merged revisions 1337300 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1337300 | dkulp | 2012-05-11 13:39:46 -0400 (Fri, 11 May 2012) | 9 lines Merged revisions 1337292 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1337292 | dkulp | 2012-05-11 13:35:20 -0400 (Fri, 11 May 2012) | 2 lines Update to newer threadsafe version of remote-resources ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/parent/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1337306&r1=1337305&r2=1337306&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.4.x-fixes/parent/pom.xml Fri May 11 17:41:50 2012 @@ -379,7 +379,7 @@ </plugin> <plugin> <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.2.1</version> + <version>1.3</version> <dependencies> <dependency> <groupId>org.apache.cxf.build-utils</groupId>
