Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 79471 invoked from network); 15 Apr 2008 17:36:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Apr 2008 17:36:08 -0000 Received: (qmail 45709 invoked by uid 500); 15 Apr 2008 17:36:08 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 45652 invoked by uid 500); 15 Apr 2008 17:36:08 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 45640 invoked by uid 99); 15 Apr 2008 17:36:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Apr 2008 10:36:08 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Apr 2008 17:35:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 17B871A983A; Tue, 15 Apr 2008 10:35:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r648352 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/bundle/pom.xml Date: Tue, 15 Apr 2008 17:35:43 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080415173545.17B871A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Apr 15 10:35:42 2008 New Revision: 648352 URL: http://svn.apache.org/viewvc?rev=648352&view=rev Log: Merged revisions 648344 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r648344 | dkulp | 2008-04-15 13:23:11 -0400 (Tue, 15 Apr 2008) | 2 lines [CXF-1506] Re-add manifest data lost during transition from jar packaging to osgi bundle ........ Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=648352&r1=648351&r2=648352&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Tue Apr 15 10:35:42 2008 @@ -228,6 +228,13 @@ true + Apache CXF + The Apache Software Foundation + org.apache + ${pom.version} + Apache CXF + The Apache Software Foundation + ${pom.version} com.ctc.wstx*;resolution:=optional, com.ibm*;resolution:=optional,