You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2010/11/02 04:08:26 UTC

svn commit: r1029944 - in /cxf/branches/2.3.x-fixes: ./ distribution/bundle/all/pom.xml distribution/bundle/jaxrs/pom.xml distribution/bundle/minimal/pom.xml

Author: ffang
Date: Tue Nov  2 03:08:25 2010
New Revision: 1029944

URL: http://svn.apache.org/viewvc?rev=1029944&view=rev
Log:
Merged revisions 1029943 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1029943 | ffang | 2010-11-02 10:57:50 +0800 (二, 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.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml
    cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
    cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov  2 03:08:25 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509,1027553,1027599,1028170
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509,1027553,1027599,1028170,1029943

Modified: cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml?rev=1029944&r1=1029943&r2=1029944&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml Tue Nov  2 03:08:25 2010
@@ -311,7 +311,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;version="[1.0,2)",
                             org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,

Modified: cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=1029944&r1=1029943&r2=1029944&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml Tue Nov  2 03:08:25 2010
@@ -137,7 +137,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;version="[1.0,2)",
                             org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,

Modified: cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml?rev=1029944&r1=1029943&r2=1029944&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml Tue Nov  2 03:08:25 2010
@@ -190,7 +190,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;version="[1.0,2)",
                             org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
                             org.apache.commons.codec*;resolution:=optional,