cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] cxf git commit: OpenJpa upgrade to 2.4.2
Date Mon, 16 Jan 2017 10:52:19 GMT
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>


Mime
View raw message