cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1306112 - in /cxf/branches/2.4.x-fixes: ./ osgi/bundle/all/pom.xml osgi/bundle/minimal/pom.xml
Date Wed, 28 Mar 2012 02:05:11 GMT
Author: ningjiang
Date: Wed Mar 28 02:05:10 2012
New Revision: 1306112

URL: http://svn.apache.org/viewvc?rev=1306112&view=rev
Log:
Merged revisions 1306110 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1306110 | ningjiang | 2012-03-28 09:47:21 +0800 (Wed, 28 Mar 2012) | 9 lines
  
  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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
    cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/branches/2.5.x-fixes:r1306110
  Merged /cxf/trunk:r1306102

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml?rev=1306112&r1=1306111&r2=1306112&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml Wed Mar 28 02:05:10 2012
@@ -328,6 +328,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.4.x-fixes/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml?rev=1306112&r1=1306111&r2=1306112&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml Wed Mar 28 02:05:10 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,



Mime
View raw message