cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/3] cxf git commit: Fixing merge
Date Mon, 16 Jan 2017 10:52:20 GMT
Fixing merge


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

Branch: refs/heads/3.1.x-fixes
Commit: 27025e07f6803905e0e0ccaa7ad90d828e2ad610
Parents: f9144a9
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Jan 16 10:14:17 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Jan 16 10:14:17 2017 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/27025e07/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index afca817..a91900a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -103,13 +103,9 @@
         <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