Repository: cxf-fediz
Updated Branches:
refs/heads/1.1.x-fixes 2af501c5e -> ce877b5e1
Updating some dependencies
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ce877b5e
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ce877b5e
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ce877b5e
Branch: refs/heads/1.1.x-fixes
Commit: ce877b5e1881780c16646d5210b3a916fd30654f
Parents: 2af501c
Author: Colm O hEigeartaigh <[email protected]>
Authored: Mon Dec 22 11:23:25 2014 +0000
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Mon Dec 22 11:35:47 2014 +0000
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ce877b5e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ccbc3c4..9acbfb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,14 +37,14 @@
<cxf.version>2.7.14</cxf.version>
<cxf.build-utils.version>2.6.0</cxf.build-utils.version>
<ehcache.version>2.5.1</ehcache.version>
- <httpclient.version>4.3.3</httpclient.version>
+ <httpclient.version>4.3.5</httpclient.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
<javassist.version>3.16.1-GA</javassist.version>
<javax.validation.version>1.1.0.Final</javax.validation.version>
<jericho.version>3.3</jericho.version>
<jetty.version>8.1.12.v20130726</jetty.version>
<!--<jetty.version>7.6.8.v20121106</jetty.version>-->
- <junit.version>4.11</junit.version>
+ <junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
<ognl.version>3.0.8</ognl.version>
<openjpa.version>2.3.0</openjpa.version>
