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 2010/03/09 01:20:25 UTC
svn commit: r920582 - in /cxf/branches/2.2.x-fixes: ./
distribution/bundle/all/pom.xml distribution/bundle/minimal/pom.xml
Author: dkulp
Date: Tue Mar 9 00:20:25 2010
New Revision: 920582
URL: http://svn.apache.org/viewvc?rev=920582&view=rev
Log:
Merged revisions 920567 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r920567 | dkulp | 2010-03-08 18:40:18 -0500 (Mon, 08 Mar 2010) | 2 lines
[CXF-2694] Make security imports optional
Patch from S. Ali Tokmen applied
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
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=920582&r1=920581&r2=920582&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 Tue Mar 9 00:20:25 2010
@@ -280,6 +280,7 @@
org.apache.log4j*;resolution:=optional,
org.apache.velocity*;resolution:=optional,
org.apache.xmlbeans*;resolution:=optional,
+ org.apache.xml.security*;resolution:=optional,
org.apache.ws.security*;resolution:=optional,
org.codehaus.jra*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=920582&r1=920581&r2=920582&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Tue Mar 9 00:20:25 2010
@@ -182,6 +182,7 @@
org.apache.log4j*;resolution:=optional,
org.apache.velocity*;resolution:=optional,
org.apache.xmlbeans*;resolution:=optional,
+ org.apache.xml.security*;resolution:=optional,
org.apache.ws.security*;resolution:=optional,
org.codehaus.jra*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,