DATACOUCH-11 - Jackson upgrade

pom.xml

@@ -14,16 +14,15 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.RELEASE</version>
 	</parent>
 
 	<properties>
 		<couchbase>1.1.6</couchbase>
-		<jackson>1.9.12</jackson>
+		<jackson>2.2.2</jackson>
 		<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
 	</properties>
 
-
 	<dependencies>
 
 		<dependency>
@@ -76,8 +75,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
 			<version>${jackson}</version>
 		</dependency>
 
@@ -92,6 +91,10 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
+        <repository>
+            <id>spring-lib-snapshot</id>
+            <url>http://repo.springsource.org/libs-snapshot-local</url>
+        </repository>
 	</repositories>
 
 </project>

src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java

@@ -26,10 +26,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import org.codehaus.jackson.JsonEncoding;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java

@@ -25,8 +25,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.data.mapping.model.MappingException;
 
 public class ConvertedCouchbaseDocument {

src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java

@@ -142,8 +142,8 @@ public void storeListsAndMaps() {
 
     template.save(complex);
 
-    String expected = "{\"info1\":{\"foo\":true,\"bar\":false},\"votes\":[],"
-      + "\"firstnames\":[\"Michael\",\"Thomas\"],\"info2\":{}}";
+    String expected = "{\"firstnames\":[\"Michael\",\"Thomas\"],\"info2\":{}," +
+      "\"info1\":{\"foo\":true,\"bar\":false},\"votes\":[]}";
     assertEquals(expected, client.get(id));
 
     ComplexPerson response = template.findById(id, ComplexPerson.class);

template.mf

@@ -9,7 +9,7 @@ Export-Template:
 Import-Template:
  com.couchbase.client.*;version="${couchbase:[=.=.=,+1.0.0)}",
  net.spy.memcached.*;version="[2.8.0,3.0.0)",
- org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}",
+ com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}",
  org.springframework.*;version="${spring30:[=.=.=.=,+1.1.0)}",
  org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
  org.w3c.*;version="0.0.0"