From a0b95101691ec4349b7c6302ffa27b2944726c24 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 8 Nov 2013 02:01:29 +0000 Subject: [PATCH] fix compilation git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1539900 13f79535-47bb-0310-9956-ffa450edef68 --- .../services/interceptors/JacksonJsonConfigurator.java | 10 ++++++---- .../archiva/rest/services/AbstractArchivaRestTest.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java index a279ff419..4137eb74f 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java @@ -18,8 +18,9 @@ package org.apache.archiva.rest.services.interceptors; * 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.LoggerFactory; import org.springframework.stereotype.Service; @@ -28,8 +29,9 @@ import javax.inject.Inject; /** * class to setup Jackson Json configuration - * @since 1.4-M3 + * * @author Olivier Lamy + * @since 1.4-M3 */ @Service("archivaJacksonJsonConfigurator") public class JacksonJsonConfigurator @@ -40,6 +42,6 @@ public class JacksonJsonConfigurator public JacksonJsonConfigurator( ObjectMapper objectMapper ) { log.info( "configure jackson ObjectMapper" ); - objectMapper.configure( DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false ); + objectMapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false ); } } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java index 6655bbfe8..f0119d01e 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java @@ -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.common.utils.FileUtil; 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.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; -- 2.39.5