diff --git a/pom.xml b/pom.xml
index 189e5e7a9..70ec6b7bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,16 +14,15 @@
org.springframework.data.build
spring-data-parent
- 1.1.0.BUILD-SNAPSHOT
+ 1.1.0.RELEASE
1.1.6
- 1.9.12
+ 2.2.2
1.6.0.BUILD-SNAPSHOT
-
@@ -76,8 +75,8 @@
- org.codehaus.jackson
- jackson-mapper-asl
+ com.fasterxml.jackson.core
+ jackson-databind
${jackson}
@@ -92,6 +91,10 @@
false
+
+ spring-lib-snapshot
+ http://repo.springsource.org/libs-snapshot-local
+
diff --git a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java b/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
index ddf578dfc..cb0803b1c 100644
--- a/src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java
+++ b/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;
diff --git a/src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java b/src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java
index 25534672c..a80237708 100644
--- a/src/main/java/org/springframework/data/couchbase/core/mapping/ConvertedCouchbaseDocument.java
+++ b/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 {
diff --git a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java
index 750abf5c7..ce7896c19 100644
--- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java
+++ b/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);
diff --git a/template.mf b/template.mf
index b2a517886..5cd57e079 100644
--- a/template.mf
+++ b/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"
\ No newline at end of file