Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1539900 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-11-08 02:01:29 +00:00
parent 72c500a6b4
commit a0b9510169
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
View File

@ -18,8 +18,9 @@ package org.apache.archiva.rest.services.interceptors;
* under the License. * under the License.
*/ */
import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -28,8 +29,9 @@ import javax.inject.Inject;
/** /**
* class to setup Jackson Json configuration * class to setup Jackson Json configuration
* @since 1.4-M3 *
* @author Olivier Lamy * @author Olivier Lamy
* @since 1.4-M3
*/ */
@Service("archivaJacksonJsonConfigurator") @Service("archivaJacksonJsonConfigurator")
public class JacksonJsonConfigurator public class JacksonJsonConfigurator
@ -40,6 +42,6 @@ public class JacksonJsonConfigurator
public JacksonJsonConfigurator( ObjectMapper objectMapper ) public JacksonJsonConfigurator( ObjectMapper objectMapper )
{ {
log.info( "configure jackson ObjectMapper" ); log.info( "configure jackson ObjectMapper" );
objectMapper.configure( DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false ); objectMapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false );
} }
} }

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
View File

@ -19,6 +19,7 @@ package org.apache.archiva.rest.services;
*/ */
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.common.utils.FileUtil; import org.apache.archiva.common.utils.FileUtil;
import org.apache.archiva.redback.rest.services.AbstractRestServicesTest; import org.apache.archiva.redback.rest.services.AbstractRestServicesTest;
@ -42,7 +43,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.client.WebClient;
import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
import org.junit.Assume; import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;