cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1241212 - in /cxf/branches/2.4.x-fixes: ./ osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml osgi/bundle/minimal/pom.xml
Date Mon, 06 Feb 2012 22:09:37 GMT
Author: dkulp
Date: Mon Feb  6 22:09:36 2012
New Revision: 1241212

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

................
  r1240307 | dkulp | 2012-02-03 14:19:57 -0500 (Fri, 03 Feb 2012) | 9 lines
  
  Merged revisions 1236786 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1236786 | dkulp | 2012-01-27 12:59:13 -0500 (Fri, 27 Jan 2012) | 1 line
    
    Update to asm imports to include 4.0 which provides support for Java7
  ........
................

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

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=1241212&r1=1241211&r2=1241212&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 Mon Feb  6 22:09:36 2012
@@ -352,7 +352,7 @@
                             org.jibx*;resolution:=optional;version="[1.2.3,2)",
                             org.junit*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
+                            org.objectweb.asm*;version="[2.0,5)";resolution:=optional,
                             org.omg*;resolution:=optional,
                             org.opensaml*;resolution:=optional,
                             org.osgi.service.blueprint*;resolution:=optional,

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=1241212&r1=1241211&r2=1241212&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 Mon Feb  6 22:09:36 2012
@@ -154,7 +154,7 @@
                             org.junit*;resolution:=optional,
                             org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
                             org.mozilla.javascript*;resolution:=optional,
-                            org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
+                            org.objectweb.asm*;version="[2.0,5)";resolution:=optional,
                             org.osgi.service.blueprint*;resolution:=optional,
                             org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",

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=1241212&r1=1241211&r2=1241212&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 Mon Feb  6 22:09:36 2012
@@ -204,7 +204,7 @@
                             org.junit*;resolution:=optional,
                             org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
                             org.mozilla.javascript*;resolution:=optional,
-                            org.objectweb.asm*;version="[2.0,4)";resolution:=optional,
+                            org.objectweb.asm*;version="[2.0,5)";resolution:=optional,
                             org.osgi.service.blueprint*;resolution:=optional,
                             org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",



Mime
View raw message