You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/05/01 18:13:55 UTC
svn commit: r1332729 - in /cxf/branches/2.4.x-fixes: ./
osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml
osgi/bundle/minimal/pom.xml parent/pom.xml
Author: dkulp
Date: Tue May 1 16:13:55 2012
New Revision: 1332729
URL: http://svn.apache.org/viewvc?rev=1332729&view=rev
Log:
Merged revisions 1332720 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1332720 | dkulp | 2012-05-01 12:09:07 -0400 (Tue, 01 May 2012) | 9 lines
Merged revisions 1331436 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1331436 | dkulp | 2012-04-27 10:08:17 -0400 (Fri, 27 Apr 2012) | 2 lines
Unify location for cglib version import range
........
........
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/jaxrs/pom.xml
cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml
cxf/branches/2.4.x-fixes/parent/pom.xml
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=1332729&r1=1332728&r2=1332729&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 Tue May 1 16:13:55 2012
@@ -335,7 +335,7 @@
javax.resource*;resolution:=optional,
javax.xml.soap,
junit.framework*;resolution:=optional,
- net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
+ net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
org.apache.aries*;resolution:=optional;version="[0.2,2)",
org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
Modified: cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1332729&r1=1332728&r2=1332729&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml Tue May 1 16:13:55 2012
@@ -140,7 +140,7 @@
javax.ws.rs*,
javax.resource*;resolution:=optional,
junit.framework*;resolution:=optional,
- net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
+ net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
org.apache.aries*;resolution:=optional;version="[0.2,2)",
org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
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=1332729&r1=1332728&r2=1332729&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 Tue May 1 16:13:55 2012
@@ -190,7 +190,7 @@
javax.resource*;resolution:=optional,
javax.xml.soap,
junit.framework*;resolution:=optional,
- net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)",
+ net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
org.apache.aries*;resolution:=optional;version="[0.2,2)",
org.apache.commons.lang*;resolution:=optional;version="[2.4,3)",
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1332729&r1=1332728&r2=1332729&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue May 1 16:13:55 2012
@@ -119,6 +119,7 @@
<cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
<cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
+ <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
<cxf.fastinfoset.bundle.version>1.2.7_4</cxf.fastinfoset.bundle.version>
<cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>