diff --git a/pom.xml b/pom.xml index e285488a..70ec6b7b 100644 --- a/pom.xml +++ b/pom.xml @@ -19,11 +19,10 @@ 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 8f00e60d..d1185d3d 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 @@ -20,10 +20,10 @@ package org.springframework.data.couchbase.core.convert; 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 4c773ed1..ddd8cc61 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 @@ -19,8 +19,8 @@ package org.springframework.data.couchbase.core.mapping; 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; /** 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 11021d29..6571e587 100644 --- a/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java +++ b/src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTest.java @@ -139,8 +139,8 @@ public class CouchbaseTemplateTest { 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 b2a51788..5cd57e07 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