cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1062805 - in /cxf/branches/2.2.x-fixes: ./ distribution/bundle/all/pom.xml
Date Mon, 24 Jan 2011 14:38:27 GMT
Author: ningjiang
Date: Mon Jan 24 14:38:26 2011
New Revision: 1062805

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

................
  r1062789 | ningjiang | 2011-01-24 22:15:13 +0800 (Mon, 24 Jan 2011) | 9 lines
  
  Merged revisions 1062778 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1062778 | ningjiang | 2011-01-24 22:02:15 +0800 (Mon, 24 Jan 2011) | 1 line
    
    CXF-3279 Marking the imports of the CORABA package to be optional
  ........
................

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 24 14:38:26 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819
-/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815
+/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789
+/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778

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=1062805&r1=1062804&r2=1062805&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 Mon Jan 24 14:38:26 2011
@@ -297,7 +297,9 @@
                             org.junit*;resolution:=optional,
                             org.mortbay*;resolution:=optional,
                             org.mozilla.javascript*;resolution:=optional,
-                            org.slf4j*;resolution:=optional,
+                            org.objectweb.asm*;version="[2.0,4)",
+                            org.omg*;resolution:=optional,
+                            org.slf4j*;resolution:=optional;version="[1.5,2)",
                             org.springframework*;resolution:=optional;version="[2.5,4)",
                             javax.activation;version="[0.0,2)",
                             javax.annotation;version="[0.0,2)",



Mime
View raw message