Some cleanup before merge.

novus · Dec 6, 2012 · 6e8c577 · 6e8c577
1 parent 19719a0
commit 6e8c577
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,10 +3,6 @@ resolvers ++= Seq(
   "coda" at "http://repo.codahale.com"
 )
 
-resolvers += "Sonatype OSS Releases" at "https://oss.sonatype.org/content/repositories/releases"
-
-resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/"
-
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.0.0")
 
 addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
@@ -15,6 +11,4 @@ addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2")
 
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.0")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.2.0-SNAPSHOT")
-
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.0")
diff --git a/...novus/salat/JodaDateTimeZoneHelpers.scala → ...conversions/JodaDateTimeZoneHelpers.scala b/...novus/salat/JodaDateTimeZoneHelpers.scala → ...conversions/JodaDateTimeZoneHelpers.scala
@@ -1,11 +1,8 @@
-package com.novus.salat
+package com.novus.salat.conversions
 
 import com.mongodb.casbah.commons.conversions
 import conversions.{ MongoConversionHelper, scala }
 
-import com.mongodb.casbah.commons.Imports._
-import com.mongodb.casbah.commons.Logging
-
 import org.bson.{ BSON, Transformer }
 
 import org.scala_tools.time.Imports._

diff --git a/salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala b/salat-core/src/main/scala/com/novus/salat/json/ToJValue.scala
@@ -36,7 +36,6 @@ import com.novus.salat.TypeFinder
 import com.novus.salat.StringTypeHintStrategy
 import scala.tools.scalap.scalax.rules.scalasig.TypeRefType
 import org.bson.types.BSONTimestamp
-import org.joda.time.tz.CachedDateTimeZone
 
 object MapToJSON extends Logging {
 

diff --git a/salat-core/src/test/scala/com/novus/salat/test/SalatSpec.scala b/salat-core/src/test/scala/com/novus/salat/test/SalatSpec.scala
@@ -27,8 +27,9 @@ package com.novus.salat.test
 import com.mongodb.casbah.Imports._
 import org.specs2.mutable._
 import org.specs2.specification.{ Scope, Step }
-import com.novus.salat.{ RegisterJodaTimeZoneConversionHelpers, BigDecimalStrategy, Context }
+import com.novus.salat.{ BigDecimalStrategy, Context }
 import com.mongodb.casbah.commons.test.CasbahMutableSpecification
+import com.novus.salat.conversions.RegisterJodaTimeZoneConversionHelpers
 
 trait SalatSpec extends CasbahMutableSpecification {