summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-01-09 13:33:31 +0000
committerOlivier Lamy <olamy@apache.org>2012-01-09 13:33:31 +0000
commitb01a04df2985ff3df3de31044d3a6736a0ff606b (patch)
treeaa3160d7f947c598c693da5c0ea6e2af6fd3110b
parenta386e5ffa7a498a6b674399897724252147289ab (diff)
downloadarchiva-b01a04df2985ff3df3de31044d3a6736a0ff606b.tar.gz
archiva-b01a04df2985ff3df3de31044d3a6736a0ff606b.zip
upgrade to cxf 2.5.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1229144 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml1
-rw-r--r--pom.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index aa332e0b8..97ee00ec1 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -32,6 +32,7 @@
<archiva.baseRestUrl />
<rest.admin.pwd />
<test.useTomcat>false</test.useTomcat>
+ <jettyVersion>7.5.3.v20111011</jettyVersion>
</properties>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 2cb61e099..5eed96705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<lucene.version>3.0.3</lucene.version>
- <cxfVersion>2.4.4</cxfVersion>
+ <cxfVersion>2.5.1</cxfVersion>
<derbyVersion>10.8.2.2</derbyVersion>
<httpclient.version>4.1.2</httpclient.version>
<javaxMailVersion>1.4</javaxMailVersion>