Author: dkulp Date: Fri Jan 13 21:26:08 2012 New Revision: 1231307 URL: http://svn.apache.org/viewvc?rev=1231307&view=rev Log: Merged revisions 1231271 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1231271 | dkulp | 2012-01-13 14:44:54 -0500 (Fri, 13 Jan 2012) | 9 lines Merged revisions 1230787 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1230787 | dkulp | 2012-01-12 16:13:36 -0500 (Thu, 12 Jan 2012) | 1 line Update to newer bundle plugin ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/pom.xml?rev=1231307&r1=1231306&r2=1231307&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/pom.xml (original) +++ cxf/branches/2.4.x-fixes/pom.xml Fri Jan 13 21:26:08 2012 @@ -467,7 +467,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.4</version> + <version>2.3.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
