Skip to content
Browse files

Fixed Jackson module name and version. Fixed import still using the o…

…ld org.codehaus.jackson.
  • Loading branch information...
1 parent c4b9073 commit 975586aca58d6a23eaad7c3852519c95783d4f81 @pgelinas pgelinas committed Nov 5, 2012
View
3 org.ektorp/pom.xml
@@ -55,17 +55,14 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.0.0-RC1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.0.0-RC1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.0.0-RC1</version>
</dependency>
</dependencies>
</project>
View
18 org.ektorp/src/main/java/org/ektorp/ReplicatorDocument.java
@@ -1,23 +1,25 @@
package org.ektorp;
-import org.codehaus.jackson.annotate.JsonAnySetter;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.ektorp.support.CouchDbDocument;
-
import java.util.Calendar;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import org.ektorp.support.CouchDbDocument;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* Represents Couch documents used by the Couch _replicator database.
*/
-@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@JsonInclude(Include.NON_NULL)
public class ReplicatorDocument extends CouchDbDocument
{
- @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+ @JsonInclude(Include.NON_NULL)
public static class UserContext
{
private String name;
View
4 org.ektorp/src/main/java/org/ektorp/impl/PageResponseHandler.java
@@ -3,14 +3,16 @@
import java.util.Collections;
import java.util.List;
-import org.codehaus.jackson.map.ObjectMapper;
import org.ektorp.Page;
import org.ektorp.PageRequest;
import org.ektorp.http.HttpResponse;
import org.ektorp.http.StdResponseHandler;
import org.ektorp.util.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
/**
*
* @author henrik
View
5 org.ektorp/src/main/java/org/ektorp/impl/QueryResultParser.java
@@ -8,15 +8,16 @@
import java.util.List;
import java.util.Map;
+import org.ektorp.DbAccessException;
+import org.ektorp.ViewResultException;
+
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.JsonToken;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.ektorp.DbAccessException;
-import org.ektorp.ViewResultException;
public class QueryResultParser<T> {
View
9 org.ektorp/src/main/java/org/ektorp/impl/jackson/EktorpAnnotationIntrospector.java
@@ -9,15 +9,16 @@
import java.util.Map;
import java.util.Set;
+import org.ektorp.docref.DocumentReferences;
+import org.ektorp.impl.NameConventions;
+import org.ektorp.util.Predicate;
+import org.ektorp.util.ReflectionUtils;
+
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
import com.fasterxml.jackson.databind.introspect.AnnotatedField;
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector;
-import org.ektorp.docref.DocumentReferences;
-import org.ektorp.impl.NameConventions;
-import org.ektorp.util.Predicate;
-import org.ektorp.util.ReflectionUtils;
public class EktorpAnnotationIntrospector extends NopAnnotationIntrospector {
View
7 org.ektorp/src/main/java/org/ektorp/support/AttachmentsInOrderParser.java
@@ -1,13 +1,14 @@
package org.ektorp.support;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+
/**
* A document's MIME multipart/related representation produced by CouchDB
* uses the order of the attachments in the JSON _attachments object as the
View
13 org.ektorp/src/test/java/org/ektorp/ReplicatorDocumentTest.java
@@ -1,17 +1,18 @@
package org.ektorp;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
public class ReplicatorDocumentTest
{
View
13 org.ektorp/src/test/java/org/ektorp/ReplicatorDocument_UserContextTest.java
@@ -1,17 +1,18 @@
package org.ektorp;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
public class ReplicatorDocument_UserContextTest
{
View
15 org.ektorp/src/test/java/org/ektorp/support/AttachmentsInOrderParserTest.java
@@ -1,18 +1,19 @@
package org.ektorp.support;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonParser;
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
public class AttachmentsInOrderParserTest
{
View
20 org.ektorp/src/test/java/org/ektorp/support/SimpleViewGeneratorTest.java
@@ -1,14 +1,20 @@
package org.ektorp.support;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.ektorp.*;
-import org.ektorp.docref.*;
-import org.junit.*;
+import org.ektorp.CouchDbConnector;
+import org.ektorp.docref.DocumentReferences;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
public class SimpleViewGeneratorTest {
View
17 pom.xml
@@ -44,7 +44,7 @@
<mockito.version>1.8.5</mockito.version>
<junit.version>4.8.2</junit.version>
<joda.time.version>1.6.2</joda.time.version>
- <jackson.version>1.9.7</jackson.version>
+ <jackson.version>2.1.0</jackson.version>
<spring.version>3.1.1.RELEASE</spring.version>
<commons.io.version>2.0.1</commons.io.version>
<httpclient.version>4.1.2</httpclient.version>
@@ -54,13 +54,18 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
@@ -194,4 +199,4 @@
</build>
</profile>
</profiles>
-</project>
+</project>

0 comments on commit 975586a

Please sign in to comment.
Something went wrong with that request. Please try again.