From c9614ab7953353b9ca97bc732dffff584ac4545d Mon Sep 17 00:00:00 2001
From: Ivan Porto Carrero <ivan@flanders.co.nz>
Date: Sat, 22 Jun 2013 22:34:21 -0700
Subject: [PATCH] force maven style publishing

---
 build.sbt                                      | 18 ++++++++++++++++--
 project/plugins.sbt                            |  2 +-
 .../codegen/ScalaAsyncClientGenerator.scala    |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index fae4e47e826..37c86a45bc6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -49,12 +49,26 @@ packageOptions <+= (name, version, organization) map {
 }
 
 publishTo <<= (version) { version: String =>
+  val artifactory = "https://ci.aws.wordnik.com/artifactory/m2-"
   if (version.trim.endsWith("SNAPSHOT"))
-    Some("Sonatype Nexus Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
+    Some("snapshots" at artifactory + "snapshots")
   else
-    Some("Sonatype Nexus Releases" at "https://oss.sonatype.org/content/repositories/releases")
+    Some("releases"  at artifactory + "releases")
 }
 
+//publishTo <<= (version) { version: String =>
+//  if (version.trim.endsWith("SNAPSHOT"))
+//    Some("Sonatype Nexus Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
+//  else
+//    Some("Sonatype Nexus Releases" at "https://oss.sonatype.org/content/repositories/releases")
+//}
+
+publishMavenStyle := true
+
+publishArtifact in Test := false
+
+pomIncludeRepository := { x => false }
+
 credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
 
 homepage := Some(new URL("https://github.com/wordnik/swagger-codegen"))
diff --git a/project/plugins.sbt b/project/plugins.sbt
index e9dd5feefb9..2853cf34bfc 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.5")
\ No newline at end of file
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.9.0")
diff --git a/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
index 132e6f8eaf6..33bad509735 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/ScalaAsyncClientGenerator.scala
@@ -204,7 +204,7 @@ class ScalaAsyncClientGenerator(cfg: SwaggerGenConfig) extends BasicGenerator {
   override val modelPackage: Option[String] = Some(packageName + ".model")
   override val apiPackage: Option[String] = Some(packageName + ".apis")
   override val reservedWords: Set[String] = Set("type", "package", "match", "object")
-  override val importMapping = Map("Date" -> "org.joda.time.DateTime", "DateTimeZone" -> "org.joda.time.DateTimeZone")
+  override val importMapping = Map("Date" -> "org.joda.time.DateTime", "DateTimeZone" -> "org.joda.time.DateTimeZone", "Chronology" -> "org.joda.time.Chronology")
   override val typeMapping = Map(
       "boolean" -> "Boolean",
       "string" -> "String",