cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1332720 - in /cxf/branches/2.5.x-fixes: osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml osgi/bundle/minimal/pom.xml parent/pom.xml
Date Tue, 01 May 2012 16:09:08 GMT
Author: dkulp
Date: Tue May  1 16:09:07 2012
New Revision: 1332720

URL: http://svn.apache.org/viewvc?rev=1332720&view=rev
Log:
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.5.x-fixes/osgi/bundle/all/pom.xml
    cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml
    cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml
    cxf/branches/2.5.x-fixes/parent/pom.xml

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=1332720&r1=1332719&r2=1332720&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 Tue May  1 16:09:07 2012
@@ -340,7 +340,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.5.x-fixes/osgi/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1332720&r1=1332719&r2=1332720&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml Tue May  1 16:09:07 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.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=1332720&r1=1332719&r2=1332720&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 Tue May  1 16:09:07 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.5.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1332720&r1=1332719&r2=1332720&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/parent/pom.xml Tue May  1 16:09:07 2012
@@ -124,6 +124,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>
         <cxf.ehcache.version>2.5.1</cxf.ehcache.version>



Mime
View raw message