Return-Path: 
 <commits-return-23707-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 84FCEEC7D
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu,  6 Dec 2012 08:39:13 +0000 (UTC)
Received: (qmail 81618 invoked by uid 500); 6 Dec 2012 08:39:12 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 81441 invoked by uid 500); 6 Dec 2012 08:39:12 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 81376 invoked by uid 99); 6 Dec 2012 08:39:09 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2012 08:39:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2012 08:39:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0D05923889BB;
	Thu,  6 Dec 2012 08:38:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1417770 - in /cxf/trunk:
 osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Date: Thu, 06 Dec 2012 08:38:47 -0000
To: commits@cxf.apache.org
From: ningjiang@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121206083848.0D05923889BB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ningjiang
Date: Thu Dec  6 08:38:46 2012
New Revision: 1417770

URL: http://svn.apache.org/viewvc?rev=1417770&view=rev
Log:
CXF-4681 Fixed the karaf feature issues

Modified:
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/parent/pom.xml

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1417770&r1=1417769&r2=1417770&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Thu Dec  6 08:38:46 2012
@@ -51,6 +51,8 @@
         <bundle start-level='35'>mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
         <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
         <bundle start-level='35'>mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
+        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${cxf.dom4j.bundle.version}</bundle>
         <bundle start-level='35' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera-parser/${cxf.abdera-parser.bundle.version}</bundle> 
         <!--bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle>
         <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>-->
@@ -90,6 +92,7 @@
     <feature name="cxf-ws-addr" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-ws-policy</feature>
         <feature version="${project.version}">cxf-bindings-soap</feature>
+        <feature version="${project.version}">cxf-databinding-jaxb</feature>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle>
     </feature>
     <feature name="cxf-ws-rm" version="${project.version}" resolver='(obr)'>
@@ -244,6 +247,7 @@
     </feature>
     <feature name="cxf-transports-udp" version="${project.version}" resolver='(obr)'>
         <feature version="${project.version}">cxf-core</feature>
+        <bundle dependency="true">mvn:org.apache.mina/mina-core/${cxf.mina.version}</bundle>
         <bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-udp/${project.version}</bundle>
     </feature>
     <feature name="cxf-javascript" version="${project.version}" resolver='(obr)'>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1417770&r1=1417769&r2=1417770&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Thu Dec  6 08:38:46 2012
@@ -101,6 +101,7 @@
         <cxf.httpcomponents.client.version>4.2.1</cxf.httpcomponents.client.version>
         <cxf.httpcomponents.core.version>4.2.2</cxf.httpcomponents.core.version>
         <cxf.httpcomponents.core.version.range>[4.2.1,4.3.0)</cxf.httpcomponents.core.version.range>
+        <cxf.mina.version>2.0.5</cxf.mina.version>
         <cxf.geronimo.annotation.version>1.1.1</cxf.geronimo.annotation.version>
         <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
         <cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
@@ -184,6 +185,7 @@
         <cxf.bcel.bundle.version>5.2_4</cxf.bcel.bundle.version>
         <cxf.xalan.bundle.version>2.7.1_5</cxf.xalan.bundle.version>
         <cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version>
+        <cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version>
         <cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version>
 
 
@@ -594,7 +596,7 @@
             <dependency>
                 <groupId>org.apache.mina</groupId>
                 <artifactId>mina-core</artifactId>
-                <version>2.0.5</version>
+                <version>${cxf.mina.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>