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 36B5873FE for ; Fri, 23 Dec 2011 18:14:57 +0000 (UTC) Received: (qmail 28592 invoked by uid 500); 23 Dec 2011 18:14:57 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 28535 invoked by uid 500); 23 Dec 2011 18:14:57 -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 28528 invoked by uid 99); 23 Dec 2011 18:14:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2011 18:14:57 +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; Fri, 23 Dec 2011 18:14:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 79EDF238897D for ; Fri, 23 Dec 2011 18:14:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1222774 - in /cxf/branches/2.4.x-fixes: ./ osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml osgi/bundle/minimal/pom.xml Date: Fri, 23 Dec 2011 18:14:35 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111223181435.79EDF238897D@eris.apache.org> Author: dkulp Date: Fri Dec 23 18:14:34 2011 New Revision: 1222774 URL: http://svn.apache.org/viewvc?rev=1222774&view=rev Log: Merged revisions 1222469 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1222469 | ay | 2011-12-22 16:36:40 -0500 (Thu, 22 Dec 2011) | 1 line specifying cxf version for META-INF.cxf* exports ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml?rev=1222774&r1=1222773&r2=1222774&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml (original) +++ cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml Fri Dec 23 18:14:34 2011 @@ -372,8 +372,8 @@ org.apache.cxf.bus.osgi.OSGiExtensionLocator org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first, - '=META-INF.cxf.osgi', - '=META-INF.cxf' + '=META-INF.cxf.osgi';version=${cxf.osgi.version.clean}, + '=META-INF.cxf';version=${cxf.osgi.version.clean} <_failok>true <_nouses>true Modified: cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1222774&r1=1222773&r2=1222774&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml (original) +++ cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml Fri Dec 23 18:14:34 2011 @@ -172,8 +172,8 @@ org.apache.cxf.bus.osgi.OSGiExtensionLocator org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first, - '=META-INF.cxf.osgi', - '=META-INF.cxf' + '=META-INF.cxf.osgi';version=${cxf.osgi.version.clean}, + '=META-INF.cxf';version=${cxf.osgi.version.clean} <_failok>true <_nouses>true Modified: cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml?rev=1222774&r1=1222773&r2=1222774&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml (original) +++ cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml Fri Dec 23 18:14:34 2011 @@ -222,8 +222,8 @@ org.apache.cxf.bus.osgi.OSGiExtensionLocator org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first, - '=META-INF.cxf', - '=META-INF.cxf.osgi', + '=META-INF.cxf';version=${cxf.osgi.version.clean}, + '=META-INF.cxf.osgi';version=${cxf.osgi.version.clean}, '=schemas', '=schemas.configuration', '=schemas.wsdl'