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 9AD6648AA for ; Thu, 23 Jun 2011 15:48:07 +0000 (UTC) Received: (qmail 88562 invoked by uid 500); 23 Jun 2011 15:48:07 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 88482 invoked by uid 500); 23 Jun 2011 15:48:07 -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 88475 invoked by uid 99); 23 Jun 2011 15:48:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Jun 2011 15:48:07 +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, 23 Jun 2011 15:48:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 05FAD238896F for ; Thu, 23 Jun 2011 15:47:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1138946 - in /cxf/branches/2.4.x-fixes: ./ distribution/bundle/all/pom.xml distribution/bundle/minimal/pom.xml Date: Thu, 23 Jun 2011 15:47:43 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110623154744.05FAD238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Jun 23 15:47:43 2011 New Revision: 1138946 URL: http://svn.apache.org/viewvc?rev=1138946&view=rev Log: Merged revisions 1138097 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1138097 | dkulp | 2011-06-21 13:11:53 -0400 (Tue, 21 Jun 2011) | 1 line Mark blueprint optional in the all and minimal bundles ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Jun 23 15:47:43 2011 @@ -1 +1 @@ -/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1137964,1138220,1138644,1138913,1138919 +/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135106,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1136960,1137509,1137658-1137678,1137793,1137960,1137964,1138097,1138220,1138644,1138913,1138919 Modified: cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml?rev=1138946&r1=1138945&r2=1138946&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml (original) +++ cxf/branches/2.4.x-fixes/distribution/bundle/all/pom.xml Thu Jun 23 15:47:43 2011 @@ -354,6 +354,7 @@ org.objectweb.asm*;version="[2.0,4)";resolution:=optional, org.omg*;resolution:=optional, org.opensaml*;resolution:=optional, + org.osgi.service.blueprint*;resolution:=optional, org.slf4j*;resolution:=optional;version="[1.5,2)", org.springframework*;resolution:=optional;version="[2.5,4)", javax.activation;version="[0.0,2)", Modified: cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml?rev=1138946&r1=1138945&r2=1138946&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml (original) +++ cxf/branches/2.4.x-fixes/distribution/bundle/minimal/pom.xml Thu Jun 23 15:47:43 2011 @@ -204,6 +204,7 @@ org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)", org.mozilla.javascript*;resolution:=optional, org.objectweb.asm*;version="[2.0,4)";resolution:=optional, + org.osgi.service.blueprint*;resolution:=optional, org.slf4j*;resolution:=optional;version="[1.5,2)", org.springframework*;resolution:=optional;version="[2.5,4)", javax.activation;version="[0.0,2)",