svn commit: r1539900 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src: main/java/org/apache/archiva/rest/services/interceptors/ test/java/org/apache/archiva/rest/services/

[olamy]

Author: olamy
Date: Fri Nov  8 02:01:29 2013
New Revision: 1539900

URL: http://svn.apache.org/r1539900
Log:
fix compilation

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java?rev=1539900&r1=1539899&r2=1539900&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/interceptors/JacksonJsonConfigurator.java
 Fri Nov  8 02:01:29 2013
@@ -18,8 +18,9 @@ package org.apache.archiva.rest.services
  * 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 );
     }
 }

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java?rev=1539900&r1=1539899&r2=1539900&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/AbstractArchivaRestTest.java
 Fri Nov  8 02:01:29 2013
@@ -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;