From c2e64b8975ed28c9734a04657f7815f8465d7297 Mon Sep 17 00:00:00 2001
From: Ian Eure <ian.eure@gmail.com>
Date: Mon, 1 Oct 2012 14:54:13 -0700
Subject: [PATCH 1/2] Support Joda-Time types.

---
 pom.xml                                             | 12 +++++++++++-
 src/main/scala/com/codahale/jerkson/Json.scala      |  2 ++
 .../jerkson/tests/FancyTypeSupportSpec.scala        | 13 +++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bbf5c42..462bc5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <scala.version>2.9.1</scala.version>
-        <jackson.version>2.0.2</jackson.version>
+        <jackson.version>2.0.4</jackson.version>
     </properties>
 
     <developers>
@@ -68,6 +68,16 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.joda</groupId>
+            <artifactId>joda-convert</artifactId>
+            <version>1.2</version>
+        </dependency>
         <dependency>
             <groupId>com.codahale</groupId>
             <artifactId>simplespec_${scala.version}</artifactId>
diff --git a/src/main/scala/com/codahale/jerkson/Json.scala b/src/main/scala/com/codahale/jerkson/Json.scala
index 1448f36..128185b 100644
--- a/src/main/scala/com/codahale/jerkson/Json.scala
+++ b/src/main/scala/com/codahale/jerkson/Json.scala
@@ -2,6 +2,7 @@ package com.codahale.jerkson
 
 import com.fasterxml.jackson.databind.{MappingJsonFactory, ObjectMapper}
 import com.fasterxml.jackson.core.{JsonGenerator, JsonParser => JacksonParser}
+import com.fasterxml.jackson.datatype.joda.JodaModule
 
 object Json extends Json
 
@@ -10,6 +11,7 @@ trait Json extends Parser with Generator {
 
   protected val mapper = new ObjectMapper
   mapper.registerModule(new ScalaModule(classLoader))
+  mapper.registerModule(new JodaModule)
 
   protected val factory = new MappingJsonFactory(mapper)
   factory.enable(JsonGenerator.Feature.AUTO_CLOSE_JSON_CONTENT)
diff --git a/src/test/scala/com/codahale/jerkson/tests/FancyTypeSupportSpec.scala b/src/test/scala/com/codahale/jerkson/tests/FancyTypeSupportSpec.scala
index 9d94e74..46892f9 100644
--- a/src/test/scala/com/codahale/jerkson/tests/FancyTypeSupportSpec.scala
+++ b/src/test/scala/com/codahale/jerkson/tests/FancyTypeSupportSpec.scala
@@ -3,6 +3,7 @@ package com.codahale.jerkson.tests
 import java.net.URI
 import com.codahale.simplespec.Spec
 import org.junit.Test
+import org.joda.time.DateTime
 import com.codahale.jerkson.Json._
 import java.util.UUID
 
@@ -28,4 +29,16 @@ class FancyTypeSupportSpec extends Spec {
       parse[UUID]("\"a62047e4-bfb5-4d71-aad7-1a6b338eee63\"").must(be(uuid))
     }
   }
+
+  class `A Joda DateTime` {
+    val ts = new DateTime("1883-07-03")
+
+    @Test def `Generates a JSON int` {
+      generate(ts).must(be("-2729606822000"))
+    }
+
+    @Test def `Is parsable from a JSON string` = {
+      parse[DateTime]("-2729606822000").compareTo(ts).must(be(0))
+    }
+  }
 }

From 2c9574ea6fe19759ce391222112a001d3515e35f Mon Sep 17 00:00:00 2001
From: Ian Eure <ian.eure@gmail.com>
Date: Tue, 2 Oct 2012 14:59:36 -0700
Subject: [PATCH 2/2] No `-SNAPSHOT`.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 462bc5d..863ac8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.codahale</groupId>
     <artifactId>jerkson_2.9.1</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.6.0</version>
     <name>Jerkson for Scala</name>
 
     <properties>