You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/25 23:11:30 UTC
svn commit: r1293703 - in /archiva/trunk:
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
pom.xml
Author: olamy
Date: Sat Feb 25 22:11:29 2012
New Revision: 1293703
URL: http://svn.apache.org/viewvc?rev=1293703&view=rev
Log:
upgrade to cxf 2.5.2
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1293703&r1=1293702&r2=1293703&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Sat Feb 25 22:11:29 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1293703&r1=1293702&r2=1293703&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml Sat Feb 25 22:11:29 2012
@@ -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"/>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1293703&r1=1293702&r2=1293703&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Sat Feb 25 22:11:29 2012
@@ -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>
@@ -471,6 +471,11 @@
<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>
<version>${cxfVersion}</version>