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 00CE8960D for ; Tue, 1 May 2012 16:09:33 +0000 (UTC) Received: (qmail 84800 invoked by uid 500); 1 May 2012 16:09:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 84755 invoked by uid 500); 1 May 2012 16:09:32 -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 84748 invoked by uid 99); 1 May 2012 16:09:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 May 2012 16:09:32 +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; Tue, 01 May 2012 16:09:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A8E7E2388865; Tue, 1 May 2012 16:09:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1332720 - in /cxf/branches/2.5.x-fixes: osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml osgi/bundle/minimal/pom.xml parent/pom.xml Date: Tue, 01 May 2012 16:09:08 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120501160908.A8E7E2388865@eris.apache.org> Author: dkulp Date: Tue May 1 16:09:07 2012 New Revision: 1332720 URL: http://svn.apache.org/viewvc?rev=1332720&view=rev Log: Merged revisions 1331436 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1331436 | dkulp | 2012-04-27 10:08:17 -0400 (Fri, 27 Apr 2012) | 2 lines Unify location for cglib version import range ........ Modified: cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml cxf/branches/2.5.x-fixes/parent/pom.xml Modified: cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml?rev=1332720&r1=1332719&r2=1332720&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml (original) +++ cxf/branches/2.5.x-fixes/osgi/bundle/all/pom.xml Tue May 1 16:09:07 2012 @@ -340,7 +340,7 @@ javax.resource*;resolution:=optional, javax.xml.soap, junit.framework*;resolution:=optional, - net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)", + net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}", org.apache.abdera*;resolution:=optional;version="[1.0,2)", org.apache.aries*;resolution:=optional;version="[0.2,2)", org.apache.commons.lang*;resolution:=optional;version="[2.4,3)", Modified: cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1332720&r1=1332719&r2=1332720&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml (original) +++ cxf/branches/2.5.x-fixes/osgi/bundle/jaxrs/pom.xml Tue May 1 16:09:07 2012 @@ -140,7 +140,7 @@ javax.ws.rs*, javax.resource*;resolution:=optional, junit.framework*;resolution:=optional, - net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)", + net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}", org.apache.abdera*;resolution:=optional;version="[1.0,2)", org.apache.aries*;resolution:=optional;version="[0.2,2)", org.apache.commons.lang*;resolution:=optional;version="[2.4,3)", Modified: cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml?rev=1332720&r1=1332719&r2=1332720&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml (original) +++ cxf/branches/2.5.x-fixes/osgi/bundle/minimal/pom.xml Tue May 1 16:09:07 2012 @@ -190,7 +190,7 @@ javax.resource*;resolution:=optional, javax.xml.soap, junit.framework*;resolution:=optional, - net.sf.cglib*;resolution:=optional;version="[2.1.3, 3.0.0)", + net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}", org.apache.abdera*;resolution:=optional;version="[1.0,2)", org.apache.aries*;resolution:=optional;version="[0.2,2)", org.apache.commons.lang*;resolution:=optional;version="[2.4,3)", Modified: cxf/branches/2.5.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/parent/pom.xml?rev=1332720&r1=1332719&r2=1332720&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.5.x-fixes/parent/pom.xml Tue May 1 16:09:07 2012 @@ -124,6 +124,7 @@ 3.2.1 2.2_2 + [2.1.3,3.0.0) 1.2.7_4 1.9.4 2.5.1