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 A4557692F for ; Thu, 26 May 2011 21:22:23 +0000 (UTC) Received: (qmail 7929 invoked by uid 500); 26 May 2011 21:22:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 7878 invoked by uid 500); 26 May 2011 21:22:23 -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 7871 invoked by uid 99); 26 May 2011 21:22:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2011 21:22:23 +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, 26 May 2011 21:22:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E53D238890D; Thu, 26 May 2011 21:22:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1128094 - in /cxf/branches/2.3.x-fixes: ./ distribution/bundle/jaxrs/pom.xml Date: Thu, 26 May 2011 21:22:02 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110526212202.4E53D238890D@eris.apache.org> Author: dkulp Date: Thu May 26 21:22:01 2011 New Revision: 1128094 URL: http://svn.apache.org/viewvc?rev=1128094&view=rev Log: Merged revisions 1128092 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1128092 | dkulp | 2011-05-26 17:18:42 -0400 (Thu, 26 May 2011) | 2 lines [CXF-3500] Mark more jaxrs deps optional Patch from Ka-Lok Fung applied ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ svn:mergeinfo = /cxf/trunk:1128092 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=1128094&r1=1128093&r2=1128094&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml (original) +++ cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml Thu May 26 21:22:01 2011 @@ -143,7 +143,10 @@ org.apache.commons.codec*;resolution:=optional, org.apache.commons.pool*;resolution:=optional, org.apache.log4j*;resolution:=optional, + org.apache.neethi;resolution:=optional, org.apache.velocity*;resolution:=optional, + org.apache.ws.commons.schema*;resolution:=optional, + org.apache.xml.resolver*;resolution:=optional, org.apache.xmlbeans*;resolution:=optional, org.codehaus.jra*;resolution:=optional, org.codehaus.jettison*;resolution:=optional, @@ -152,13 +155,14 @@ org.junit*;resolution:=optional, 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.slf4j*;resolution:=optional;version="[1.5,2)", org.springframework*;resolution:=optional;version="[2.5,4)", javax.activation;version="[0.0,2)", javax.annotation;version="[0.0,2)", javax.jms;resolution:=optional;version="[0.0,2)", javax.jws*;version="[0.0,3)", - javax.mail*;version="[0.0,2)", + javax.mail*;version="[0.0,2)";resolution:=optional, javax.servlet.*;version="[0.0,4)";resolution:=optional, javax.xml.stream*;version="[0.0,2)", javax.xml.ws*;version="[0.0,3)";resolution:=optional,