Return-Path: 
 <commits-return-22174-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
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 867869CC8
	for <apmail-cxf-commits-archive@www.apache.org>;
 Tue, 25 Sep 2012 19:33:01 +0000 (UTC)
Received: (qmail 26430 invoked by uid 500); 25 Sep 2012 19:33:01 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 26356 invoked by uid 500); 25 Sep 2012 19:33:01 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 26349 invoked by uid 99); 25 Sep 2012 19:33:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2012 19:33:01 +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, 25 Sep 2012 19:33:00 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D9C1F2388AC8;
	Tue, 25 Sep 2012 19:32:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1390091 - /cxf/branches/2.4.x-fixes/parent/pom.xml
Date: Tue, 25 Sep 2012 19:32:11 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120925193211.D9C1F2388AC8@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Tue Sep 25 19:32:11 2012
New Revision: 1390091

URL: http://svn.apache.org/viewvc?rev=1390091&view=rev
Log:
Merged revisions 1390078 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1390078 | dkulp | 2012-09-25 15:24:06 -0400 (Tue, 25 Sep 2012) | 18 lines

  Merged revisions 1389588 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

  ........
    r1389588 | dkulp | 2012-09-24 17:04:18 -0400 (Mon, 24 Sep 2012) | 10 lines

    Merged revisions 1389571 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1389571 | dkulp | 2012-09-24 16:57:15 -0400 (Mon, 24 Sep 2012) | 2 lines

      Fix issue with FI upgrade pulling in old xml API's that the JDK can provide

    ........

  ........

........

Modified:
    cxf/branches/2.4.x-fixes/parent/pom.xml

Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1390091&r1=1390090&r2=1390091&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue Sep 25 19:32:11 2012
@@ -445,6 +445,10 @@
                         <groupId>javax.xml</groupId>
                         <artifactId>jsr173</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>