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 2013/02/20 17:03:25 UTC

svn commit: r1448271 - /cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml

Author: dkulp
Date: Wed Feb 20 16:03:25 2013
New Revision: 1448271

URL: http://svn.apache.org/r1448271
Log:
Merged revisions 1448246 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1448246 | dkulp | 2013-02-20 10:39:59 -0500 (Wed, 20 Feb 2013) | 10 lines

  Merged revisions 1448235 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1448235 | dkulp | 2013-02-20 10:33:14 -0500 (Wed, 20 Feb 2013) | 2 lines

    These imports shouldn't be there.  Was a problem with the context classloader.

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/rt/transports/http/pom.xml

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=1448271&r1=1448270&r2=1448271&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 16:03:25 2013
@@ -36,9 +36,7 @@
         <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.karaf.jaas.boot.principal;resolution:=optional,
-            org.eclipse.jetty.plus.jaas;resolution:=optional
+            org.apache.aries*;version="${cxf.aries.version.range}"
         </cxf.osgi.import>
         <cxf.osgi.export>
             '=META-INF.cxf.osgi',