From commits-return-44700-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org  Mon Jan 16 10:52:19 2017
Return-Path: <commits-return-44700-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 6C718192B3
	for <apmail-cxf-commits-archive@www.apache.org>; Mon, 16 Jan 2017 10:52:19 +0000 (UTC)
Received: (qmail 91957 invoked by uid 500); 16 Jan 2017 10:52:19 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 91894 invoked by uid 500); 16 Jan 2017 10:52:19 -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 91885 invoked by uid 99); 16 Jan 2017 10:52:19 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jan 2017 10:52:19 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 3A969DFBEC; Mon, 16 Jan 2017 10:52:19 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Date: Mon, 16 Jan 2017 10:52:19 -0000
Message-Id: <025c1243e9194f7da6753dc55de58ec4@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] cxf git commit: OpenJpa upgrade to 2.4.2

Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes dd566ccce -> 2741e4a4d


OpenJpa upgrade to 2.4.2

# Conflicts:
#	parent/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f9144a9f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f9144a9f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f9144a9f

Branch: refs/heads/3.1.x-fixes
Commit: f9144a9fb6002c7ef71be549f3a4078f49441b85
Parents: dd566cc
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Jan 16 09:36:19 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Jan 16 10:13:39 2017 +0000

----------------------------------------------------------------------
 parent/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f9144a9f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a91900a..afca817 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,9 +103,13 @@
         <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version>
         <cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version>
         <cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version>
+<<<<<<< HEAD
         <cxf.openjpa.version>2.4.1</cxf.openjpa.version>
         <cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version>
         <cxf.geronimo.servlet25.version>1.2</cxf.geronimo.servlet25.version>
+=======
+        <cxf.openjpa.version>2.4.2</cxf.openjpa.version>
+>>>>>>> c55034d... OpenJpa upgrade to 2.4.2
         <cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version>
         <cxf.jasypt.bundle.version>1.9.0_1</cxf.jasypt.bundle.version>
         <cxf.javassist.version>3.19.0-GA</cxf.javassist.version>