cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Mon, 16 Nov 2015 16:33:17 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/08d6227b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08d6227b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08d6227b

Branch: refs/heads/3.0.x-fixes
Commit: 08d6227b3521251f47410b6ff4738d868dabddf1
Parents: 62437fb
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Nov 16 16:33:08 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Nov 16 16:33:08 2015 +0000

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/08d6227b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0eba423..801dfc9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,11 +83,7 @@
         <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
         <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
         <cxf.commons-codec.version>1.10</cxf.commons-codec.version>
-<<<<<<< HEAD
-        <cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
-=======
         <cxf.commons-collections.version>3.2.2</cxf.commons-collections.version>
->>>>>>> d2b5baa... [CXF-6675] - Update commons-collections from 3.2.1
to 3.2.2
         <cxf.commons-lang.version>2.6</cxf.commons-lang.version>
         <cxf.commons-lang3.version>3.4</cxf.commons-lang3.version>
         <cxf.derby.version>10.2.2.0</cxf.derby.version>


Mime
View raw message