From: Olivier Lamy <olamy@apache.org>
Date: Mon, 9 Jan 2012 13:33:31 +0000 (+0000)
Subject: upgrade to cxf 2.5.1
X-Git-Tag: archiva-1.4-M3~1615
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b01a04df2985ff3df3de31044d3a6736a0ff606b;p=archiva.git

upgrade to cxf 2.5.1

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1229144 13f79535-47bb-0310-9956-ffa450edef68
---

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>