Author: dkulp
Date: Fri Jan 13 19:44:54 2012
New Revision: 1231271
URL: http://svn.apache.org/viewvc?rev=1231271&view=rev
Log:
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.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 13 19:44:54 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229348,1229476,1229663,1229965,1230218,1230222,1230800
+/cxf/trunk:1-1227739,1227823,1228209,1228228,1228230-1228231,1228268,1228277,1228359,1228770,1228850,1229348,1229476,1229663,1229965,1230218,1230222,1230787,1230800
Modified: cxf/branches/2.5.x-fixes/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/pom.xml?rev=1231271&r1=1231270&r2=1231271&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/pom.xml Fri Jan 13 19:44:54 2012
@@ -495,7 +495,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>
