diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-02-25 22:11:29 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-02-25 22:11:29 +0000 |
| commit | 38aaec51a7be081d9a1e70b50cca8a30aa25d9c6 (patch) | |
| tree | 1d719e0edd220e724d5c6f7f85579b2645f72198 /archiva-modules | |
| parent | 1955d4ba1a5f7c3caff195ecbff8219dfc369152 (diff) | |
| download | archiva-38aaec51a7be081d9a1e70b50cca8a30aa25d9c6.tar.gz archiva-38aaec51a7be081d9a1e70b50cca8a30aa25d9c6.zip | |
upgrade to cxf 2.5.2
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293703 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
2 files changed, 9 insertions, 2 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 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"/> |