Author: dkulp Date: Thu Nov 11 20:54:40 2010 New Revision: 1034114 URL: http://svn.apache.org/viewvc?rev=1034114&view=rev Log: Merged revisions 1029944 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1029944 | ffang | 2010-11-01 23:08:25 -0400 (Mon, 01 Nov 2010) | 9 lines Merged revisions 1029943 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1029943 | ffang | 2010-11-02 10:57:50 +0800 (?\228?\186?\140, 02 11 2010) | 1 line [CXF-3107]keep net.sf.cglib optional import version range same as it used in spring-beans 3.0.x ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Propchange: cxf/branches/2.2.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=1034114&r1=1034113&r2=1034114&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Thu Nov 11 20:54:40 2010 @@ -280,7 +280,7 @@ javax.resource*;resolution:=optional, javax.xml.soap, junit.framework*;resolution:=optional, - net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)", + net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)", org.apache.abdera*;resolution:=optional, org.apache.commons.lang*;resolution:=optional, org.apache.commons.codec*;resolution:=optional, Modified: cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=1034114&r1=1034113&r2=1034114&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml Thu Nov 11 20:54:40 2010 @@ -135,7 +135,7 @@ repackage;resolution:=optional, javax.resource*;resolution:=optional, junit.framework*;resolution:=optional, - net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)", + net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)", org.apache.abdera*;resolution:=optional, org.apache.commons.lang*;resolution:=optional, org.apache.commons.codec*;resolution:=optional, Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=1034114&r1=1034113&r2=1034114&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Thu Nov 11 20:54:40 2010 @@ -182,7 +182,7 @@ javax.resource*;resolution:=optional, javax.xml.soap, junit.framework*;resolution:=optional, - net.sf.cglib*;resolution:=optional;version="[2.1.3, 2.2.0)", + net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)", org.apache.abdera*;resolution:=optional, org.apache.commons.lang*;resolution:=optional, org.apache.commons.codec*;resolution:=optional,
