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 2b85bdc61ecf0287bbb5e21641a94f0bfd7be6ed..889ac242c290c2575f1196f6caf27ce2b009bb83 100644 (file)
--- 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 5ebd88b0e11a55b4f07fec62179892694e7f6fac..4bc401fb9eda7999bd6c624b73cd779d29982a28 100644 (file)
--- 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 e3c3077af140ebd1bc004bea4149daf0b09d50c2..debe80e28182051a629b3a332a0176a3d93e8f29 100644 (file)
--- 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>