Return-Path: 
 <commits-return-24159-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 3EE6397DE
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu,  3 Jan 2013 18:53:25 +0000 (UTC)
Received: (qmail 3310 invoked by uid 500); 3 Jan 2013 18:53:25 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 3242 invoked by uid 500); 3 Jan 2013 18:53:25 -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 3232 invoked by uid 99); 3 Jan 2013 18:53:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2013 18:53:25 +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, 03 Jan 2013 18:53:23 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C197F23888FE;
	Thu,  3 Jan 2013 18:53:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1428546 - /cxf/branches/2.6.x-fixes/parent/pom.xml
Date: Thu, 03 Jan 2013 18:53:02 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130103185302.C197F23888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Thu Jan  3 18:53:02 2013
New Revision: 1428546

URL: http://svn.apache.org/viewvc?rev=1428546&view=rev
Log:
Merged revisions 1428529 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1428529 | dkulp | 2013-01-03 13:24:45 -0500 (Thu, 03 Jan 2013) | 2 lines

  Upgrade to latest junit

........

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

Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1428546&r1=1428545&r2=1428546&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Thu Jan  3 18:53:02 2013
@@ -123,10 +123,15 @@
         <cxf.jetty.osgi.version>[7.2,8.2)</cxf.jetty.osgi.version>
         <cxf.jetty.version>7.5.4.v20111024</cxf.jetty.version>
         <cxf.jibx.version>1.2.4.5</cxf.jibx.version>
+<<<<<<< HEAD
         <cxf.joda.time.version>1.6.2</cxf.joda.time.version>
         <cxf.joda.time.version2>2.1</cxf.joda.time.version2>
         <cxf.junit.version>4.10</cxf.junit.version>
 	    <cxf.maven.core.version>2.2.1</cxf.maven.core.version>
+=======
+        <cxf.junit.version>4.11</cxf.junit.version>
+        <cxf.maven.core.version>2.2.1</cxf.maven.core.version>
+>>>>>>> 83c7a1b... Upgrade to latest junit
         <cxf.msv.version>2011.1</cxf.msv.version>
         <cxf.neethi.version>3.0.2</cxf.neethi.version>
         <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version>