You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/03/28 03:47:22 UTC
svn commit: r1306110 - in /cxf/branches/2.5.x-fixes: ./
osgi/bundle/all/pom.xml osgi/bundle/minimal/pom.xml
Author: ningjiang
Date: Wed Mar 28 01:47:21 2012
New Revision: 1306110
URL: http://svn.apache.org/viewvc?rev=1306110&view=rev
Log:
Merged revisions 1306102 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1306102 | ningjiang | 2012-03-28 09:32:19 +0800 (Wed, 28 Mar 2012) | 1 line
CXF-4211 Set the importing of 'net.sf.ehcache' to be optional
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml
cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1306102
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml?rev=1306110&r1=1306109&r2=1306110&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml Wed Mar 28 01:47:21 2012
@@ -333,6 +333,7 @@
antlr*;resolution:=optional,
com.sun*;resolution:=optional,
com.ctc.wstx.msv*;resolution:=optional,
+ net.sf.ehcache*;resolution:=optional,
org.codehaus.stax2*;resolution:=optional,
commonj.sdo*;resolution:=optional,
javax.ws.rs*;resolution:=optional,
Modified: cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml?rev=1306110&r1=1306109&r2=1306110&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml Wed Mar 28 01:47:21 2012
@@ -184,6 +184,7 @@
com.sun*;resolution:=optional,
javax.ws.rs*;resolution:=optional,
com.ctc.wstx.msv*;resolution:=optional,
+ net.sf.ehcache*;resolution:=optional,
org.codehaus.stax2*;resolution:=optional,
repackage;resolution:=optional,
javax.resource*;resolution:=optional,