Return-Path: 
 <commits-return-16371-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 45BFE78D3
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 12 Oct 2011 19:28:54 +0000 (UTC)
Received: (qmail 99564 invoked by uid 500); 12 Oct 2011 19:28:54 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 99497 invoked by uid 500); 12 Oct 2011 19:28:54 -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 99490 invoked by uid 99); 12 Oct 2011 19:28:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Oct 2011 19:28:54 +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; Wed, 12 Oct 2011 19:28:51 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B71F12388A74
	for <commits@cxf.apache.org>; Wed, 12 Oct 2011 19:28:30 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1182544 - in /cxf/trunk/osgi/karaf: commands/pom.xml
 features/src/main/resources/features.xml
Date: Wed, 12 Oct 2011 19:28:30 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111012192830.B71F12388A74@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Wed Oct 12 19:28:30 2011
New Revision: 1182544

URL: http://svn.apache.org/viewvc?rev=1182544&view=rev
Log:
Updates to work with Karaf 2.2.3

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

Modified: cxf/trunk/osgi/karaf/commands/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/commands/pom.xml?rev=1182544&r1=1182543&r2=1182544&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/commands/pom.xml (original)
+++ cxf/trunk/osgi/karaf/commands/pom.xml Wed Oct 12 19:28:30 2011
@@ -69,8 +69,10 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-              org.apache.felix.service.command,
-              org.apache.felix.gogo.commands,
+              !org.apache.cxf.karaf.commands,
+              org.apache.felix.service.command;version="[0.6,1)",
+              org.apache.felix.gogo.commands;version="[0.6,1)",
+              org.apache.cxf*;version="[2.5,3)",
               org.apache.karaf.shell.console,
               *
                         </Import-Package>

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=1182544&r1=1182543&r2=1182544&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Wed Oct 12 19:28:30 2011
@@ -27,11 +27,11 @@
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> 
         <bundle>mvn:commons-pool/commons-pool/1.5.4</bundle>
-        <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/1.3_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
+        <bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
+        <bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
+        <bundle>mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${cxf.oro.bundle.version}</bundle>
+        <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.6_1</bundle>
         <bundle>mvn:org.apache.activemq/activemq-core/5.4.2</bundle> 
         <bundle>mvn:org.apache.activemq/kahadb/5.4.2</bundle>