Author: ffang Date: Wed Mar 27 08:51:52 2013 New Revision: 1461451 URL: http://svn.apache.org/r1461451 Log: Merged revisions 1461446 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1461446 | ffang | 2013-03-27 16:39:57 +0800 (三, 27 3 2013) | 9 lines Merged revisions 1461441 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1461441 | ffang | 2013-03-27 16:23:53 +0800 (三, 27 3 2013) | 1 line [CXF-4926]remove org.apache.activemq.activemq-core as Require-Bundle from wsn-core module ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/services/wsn/wsn-core/pom.xml Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1461446 Merged /cxf/trunk:r1461441 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/services/wsn/wsn-core/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/wsn/wsn-core/pom.xml?rev=1461451&r1=1461450&r2=1461451&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/services/wsn/wsn-core/pom.xml (original) +++ cxf/branches/2.6.x-fixes/services/wsn/wsn-core/pom.xml Wed Mar 27 08:51:52 2013 @@ -156,12 +156,11 @@ <configuration> <instructions> <Require-Bundle> - org.apache.activemq.activemq-core,org.apache.cxf.services.wsn.cxf-services-wsn-api + org.apache.cxf.services.wsn.cxf-services-wsn-api </Require-Bundle> <Import-Package> org.apache.cxf.wsn.util.*;version=${project.version}, !org.apache.cxf.wsn*, - !org.apache.activemq*, javax.xml.bind*;version="[0.0,3)", javax.jws*;version="[0.0,3)", javax.xml.ws*;version="[0.0,3)",
