Permalink
Browse files

Merge branch 'jackson' of https://github.com/jplock/java-apns

Conflicts:
	src/test/java/com/notnoop/apns/PayloadBuilderTest.java
  • Loading branch information...
2 parents 7ca1297 + d3dce8a commit 2a3fea1c470ef60934cf41fcc5ebb8763399433e Frohwalt Egerer committed Mar 7, 2013
View
@@ -188,9 +188,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.4.0</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.1.4</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -34,7 +34,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.notnoop.apns.internal.Utilities;
/**
@@ -7,7 +7,7 @@
import java.util.Arrays;
import java.util.Map;
import java.util.Random;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
import com.notnoop.apns.PayloadBuilder;
import com.notnoop.apns.internal.Utilities;
View
@@ -2,5 +2,5 @@ Bundle-Name: com.notnoop.apns
Bundle-ManifestVersion: 2
Import-Template:
org.slf4j.*;version="0",
- org.codehaus.jackson.*;version="0",
+ com.fasterxml.jackson.*;version="0",
javax.net.*;version="0"

0 comments on commit 2a3fea1

Please sign in to comment.