Return-Path: 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 DA923F5FA for ; Wed, 10 Apr 2013 07:20:55 +0000 (UTC) Received: (qmail 77168 invoked by uid 500); 10 Apr 2013 07:20:55 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 77042 invoked by uid 500); 10 Apr 2013 07:20:55 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 77023 invoked by uid 99); 10 Apr 2013 07:20:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 07:20: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, 10 Apr 2013 07:20:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7DB6E23888E4; Wed, 10 Apr 2013 07:20:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1466356 - in /cxf/branches/2.7.x-fixes: ./ osgi/karaf/features/src/main/resources/features.xml Date: Wed, 10 Apr 2013 07:20:31 -0000 To: commits@cxf.apache.org From: ffang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130410072031.7DB6E23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ffang Date: Wed Apr 10 07:20:31 2013 New Revision: 1466356 URL: http://svn.apache.org/r1466356 Log: Merged revisions 1466355 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1466355 | ffang | 2013-04-10 15:16:19 +0800 (δΈ‰, 10 4 2013) | 1 line [CXF-4957]remove dependency=true for saaj-api/jsr339-api specs bundle ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1466355 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1466356&r1=1466355&r2=1466356&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original) +++ cxf/branches/2.7.x-fixes/osgi/karaf/features/src/main/resources/features.xml Wed Apr 10 07:20:31 2013 @@ -25,8 +25,8 @@ mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version} mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version} mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version} - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version} - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${cxf.servicemix.specs.version} + mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version} + mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-m10/${cxf.servicemix.specs.version} mvn:javax.mail/mail/${cxf.javax.mail.version} mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}