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 A2C9ED584 for ; Tue, 8 Jan 2013 18:49:53 +0000 (UTC) Received: (qmail 33218 invoked by uid 500); 8 Jan 2013 18:49:53 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 33131 invoked by uid 500); 8 Jan 2013 18:49:53 -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 33119 invoked by uid 99); 8 Jan 2013 18:49:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 18:49:53 +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, 08 Jan 2013 18:49:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8CB3423888CD; Tue, 8 Jan 2013 18:49:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1430440 - in /cxf/trunk: api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java parent/pom.xml Date: Tue, 08 Jan 2013 18:49:32 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130108184932.8CB3423888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Jan 8 18:49:32 2013 New Revision: 1430440 URL: http://svn.apache.org/viewvc?rev=1430440&view=rev Log: Update spring version a bit. Remove spring 2.5.x profiles and support Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java cxf/trunk/parent/pom.xml Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java?rev=1430440&r1=1430439&r2=1430440&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java Tue Jan 8 18:49:32 2013 @@ -33,6 +33,7 @@ class SpringAopClassHelper extends Class Class.forName("org.springframework.aop.framework.Advised"); } + @SuppressWarnings("deprecation") protected Class getRealClassFromClassInternal(Class cls) { if (AopUtils.isCglibProxyClass(cls)) { return getRealClassFromClassInternal(cls.getSuperclass()); @@ -54,6 +55,7 @@ class SpringAopClassHelper extends Class return o; } + @SuppressWarnings("deprecation") protected Class getRealClassInternal(Object o) { if (AopUtils.isAopProxy(o) && (o instanceof Advised)) { Advised advised = (Advised)o; Modified: cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=1430440&r1=1430439&r2=1430440&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java Tue Jan 8 18:49:32 2013 @@ -505,6 +505,7 @@ public abstract class AbstractBeanDefini if (null == id || "".equals(id)) { String names = elem.getAttribute(BeanConstants.NAME_ATTR); if (null != names) { + @SuppressWarnings("deprecation") StringTokenizer st = new StringTokenizer(names, BeanDefinitionParserDelegate.BEAN_NAME_DELIMITERS); if (st.countTokens() > 0) { Modified: cxf/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1430440&r1=1430439&r2=1430440&view=diff ============================================================================== --- cxf/trunk/parent/pom.xml (original) +++ cxf/trunk/parent/pom.xml Tue Jan 8 18:49:32 2013 @@ -71,7 +71,7 @@ org.apache.cxf.*;-split-package:=first, - [2.5,4) + [3.0,4) [2.4,3) [1.5,2) [0.0,2) @@ -145,7 +145,7 @@ geronimo-servlet_2.5_spec 1.1.2 1.1 - 3.0.7.RELEASE + 3.1.3.RELEASE 1.2.1 1.3.1.RELEASE spring-test @@ -1801,15 +1801,9 @@ - spring2 + spring3.0 - 2.5.6.SEC02 - - - - spring3.1 - - 3.1.2.RELEASE + 3.0.7.RELEASE