You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2013/02/20 06:19:18 UTC
svn commit: r1448006 - in /cxf/branches/2.6.x-fixes: ./
rt/transports/http/pom.xml
Author: ffang
Date: Wed Feb 20 05:19:18 2013
New Revision: 1448006
URL: http://svn.apache.org/r1448006
Log:
Merged revisions 1448004 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1448004 | ffang | 2013-02-20 13:09:11 +0800 (三, 20 2 2013) | 9 lines
Merged revisions 1448003 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1448003 | ffang | 2013-02-20 12:58:42 +0800 (三, 20 2 2013) | 1 line
[CXF-4840]add more optional Import-Package for cxf-rt-transports-http module
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1448004
Merged /cxf/trunk:r1448003
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml?rev=1448006&r1=1448005&r2=1448006&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml Wed Feb 20 05:19:18 2013
@@ -36,7 +36,9 @@
<cxf.bundle.activator>org.apache.cxf.transport.http.osgi.HTTPTransportActivator</cxf.bundle.activator>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
- org.apache.aries*;version="${cxf.aries.version.range}"
+ org.apache.aries*;version="${cxf.aries.version.range}",
+ org.apache.karaf.jaas.boot.principal;resolution:=optional,
+ org.eclipse.jetty.plus.jaas;resolution:=optional
</cxf.osgi.import>
<cxf.osgi.export>
'=META-INF.cxf.osgi',