From: Olivier Lamy <olamy@apache.org>
Date: Sat, 25 Feb 2012 22:11:29 +0000 (+0000)
Subject: upgrade to cxf 2.5.2
X-Git-Tag: archiva-1.4-M3~1233
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38aaec51a7be081d9a1e70b50cca8a30aa25d9c6;p=archiva.git

upgrade to cxf 2.5.2

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293703 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 2b85bdc61..889ac242c 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
@@ -149,8 +149,12 @@
           </exclusion>
         </exclusions>
     </dependency>
-
-    <!-- normally not needed but here for wadl feature currently in cxf -->
+    <!--
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-jaxrs</artifactId>
+    </dependency>
+    -->
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-bundle-jaxrs</artifactId>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index 5ebd88b0e..4bc401fb9 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -42,6 +42,9 @@
   <jaxrs:server id="archivaServices" address="/archivaServices">
 
     <jaxrs:providers>
+      <!--
+      <bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
+      -->
       <ref bean="authenticationInterceptor#rest"/>
       <ref bean="permissionInterceptor#rest"/>
       <ref bean="archivaRestServiceExceptionMapper"/>
diff --git a/pom.xml b/pom.xml
index e3c3077af..debe80e28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <lucene.version>3.0.3</lucene.version>
-    <cxfVersion>2.5.1</cxfVersion>
+    <cxfVersion>2.5.2</cxfVersion>
     <derbyVersion>10.8.2.2</derbyVersion>
     <httpclient.version>4.1.3</httpclient.version>
     <httpclient.core.version>4.1.4</httpclient.core.version>
@@ -470,6 +470,11 @@
         <artifactId>jsr311-api</artifactId>
         <version>1.1.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-jaxrs</artifactId>
+        <version>1.9.5</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-bundle-jaxrs</artifactId>