cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Fixing merge
Date Mon, 22 Dec 2014 12:02:40 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 74860c548 -> b773ded29


Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: b773ded295eace488cea7a76610dc4b8a56fffdc
Parents: 74860c5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Dec 22 12:02:27 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Dec 22 12:02:27 2014 +0000

----------------------------------------------------------------------
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b773ded2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9faaf06..ef69d96 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,7 +82,7 @@
         <cxf.bcprov.version>1.51</cxf.bcprov.version>
         <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.9</cxf.commons-codec.version>
+        <cxf.commons-codec.version>1.10</cxf.commons-codec.version>
         <cxf.commons-collections.version>3.2.1</cxf.commons-collections.version>
         <cxf.commons-lang.version>2.6</cxf.commons-lang.version>
         <cxf.derby.version>10.2.2.0</cxf.derby.version>
@@ -128,7 +128,7 @@
         <cxf.jetty.version>8.1.15.v20140411</cxf.jetty.version>
         <cxf.jetty.osgi.version>[7.6,8.2)</cxf.jetty.osgi.version>
         <cxf.jibx.version>1.2.5</cxf.jibx.version>
-        <cxf.junit.version>4.11</cxf.junit.version>
+        <cxf.junit.version>4.12</cxf.junit.version>
         <cxf.maven.core.version>2.2.1</cxf.maven.core.version>
         <cxf.msv.version>2011.1</cxf.msv.version>
         <cxf.neethi.version>3.0.3</cxf.neethi.version>
@@ -1384,7 +1384,7 @@
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymock</artifactId>
-                <version>3.2</version>
+                <version>3.3</version>
                 <scope>test</scope>
             </dependency>
             <dependency>


Mime
View raw message