version 2.0.17

swagger-api · Aug 26, 2014 · 2ed68c2 · 2ed68c2
1 parent db1915e
commit 2ed68c2
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 20 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,17 +5,17 @@ organization := "com.wordnik"
 
 name := "swagger-codegen"
 
-version := "2.0.17-SNAPSHOT"
+version := "2.0.17"
 
 crossVersion := CrossVersion.full
 
 javacOptions ++= Seq("-target", "1.6", "-source", "1.6", "-Xlint:unchecked", "-Xlint:deprecation")
 
 scalacOptions ++= Seq("-optimize", "-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
 
-crossScalaVersions := Seq("2.9.0", "2.9.0-1", "2.9.1", "2.9.1-1", "2.9.2", "2.9.3", "2.10.0", "2.10.1", "2.10.2", "2.10.3", "2.10.4", "2.11.0", "2.11.1")
+crossScalaVersions := Seq("2.10.0", "2.10.1", "2.10.2", "2.10.3", "2.10.4", "2.11.0", "2.11.1")
 
-scalaVersion := "2.10.4"
+scalaVersion := "2.11.1"
 
 libraryDependencies ++= Seq(
   "org.json4s"                  %% "json4s-jackson"     % "3.2.10",
@@ -68,7 +68,7 @@ publishTo <<= (version) { version: String =>
     Some("Sonatype Nexus Releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
 }
 
-publishTo := Some(Resolver.file("file",  new File(Path.userHome.absolutePath+"/.m2/repository")))
+// publishTo := Some(Resolver.file("file",  new File(Path.userHome.absolutePath+"/.m2/repository")))
 
 artifact in (Compile, assembly) ~= { art =>
   art.copy(`classifier` = Some("assembly"))
@@ -133,4 +133,4 @@ pomExtra <<= (pomExtra, name, description) {(pom, name, desc) => pom ++ Group(
 
 assemblySettings
 
-jarName in assembly := "swagger-codegen.jar"
+// jarName in assembly := "swagger-codegen.jar"
diff --git a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala
@@ -8,7 +8,7 @@ import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.mutable.{ ListBuffer, HashMap }
 import scala.collection.JavaConverters._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class PetApiTest extends FlatSpec with ShouldMatchers {

diff --git a/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala b/samples/client/petstore/scala/src/test/scala/StoreApiTest.scala
@@ -9,7 +9,7 @@ import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.mutable.{ ListBuffer, HashMap }
 import scala.collection.JavaConversions._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class StoreApiTest extends FlatSpec with ShouldMatchers {

diff --git a/samples/client/petstore/scala/src/test/scala/UserApiTest.scala b/samples/client/petstore/scala/src/test/scala/UserApiTest.scala
@@ -8,7 +8,7 @@ import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.mutable.{ ListBuffer, HashMap }
 import scala.collection.JavaConversions._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class UserApiTest extends FlatSpec with ShouldMatchers {

diff --git a/samples/client/wordnik-api/scala/src/test/scala/AccountApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/AccountApiTest.scala
@@ -8,7 +8,7 @@ import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.mutable.{ ListBuffer, HashMap }
 import scala.collection.JavaConversions._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class AccountApiTest extends FlatSpec with ShouldMatchers with BaseApiTest {

diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordApiTest.scala
@@ -11,7 +11,7 @@ import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.mutable.{ ListBuffer, HashMap }
 import scala.collection.JavaConversions._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 import scala.io.Source
 

diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordListApiTest.scala
@@ -8,7 +8,7 @@ import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.mutable.{ ListBuffer, HashMap }
 import scala.collection.JavaConversions._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class WordListApiTest extends FlatSpec with ShouldMatchers with BaseApiTest {

diff --git a/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala b/samples/client/wordnik-api/scala/src/test/scala/WordsApiTest.scala
@@ -8,7 +8,7 @@ import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.mutable.{ ListBuffer, HashMap }
 import scala.collection.JavaConversions._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class WordsApiTest extends FlatSpec with ShouldMatchers with BaseApiTest {

diff --git a/src/main/scala/com/wordnik/swagger/codegen/model/ClientOpts.scala b/src/main/scala/com/wordnik/swagger/codegen/model/ClientOpts.scala
@@ -1,6 +1,6 @@
 package com.wordnik.swagger.codegen.model
 
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 import scala.collection.JavaConverters._
 
 class ClientOpts(

diff --git a/src/main/scala/com/wordnik/swagger/codegen/util/ValidationException.scala b/src/main/scala/com/wordnik/swagger/codegen/util/ValidationException.scala
@@ -3,7 +3,7 @@ package com.wordnik.swagger.util
 import com.wordnik.swagger.codegen.model._
 
 import scala.collection.JavaConverters._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 class ValidationException(code:Int, msg:String, errors: List[ValidationError]) extends Exception(msg:String) {
   val messages: java.util.List[ValidationMessage] = (

diff --git a/src/test/scala/BasicCSharpGeneratorTest.scala b/src/test/scala/BasicCSharpGeneratorTest.scala
@@ -24,7 +24,7 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class BasicCSharpGeneratorTest extends FlatSpec with ShouldMatchers {

diff --git a/src/test/scala/BasicJavaGeneratorTest.scala b/src/test/scala/BasicJavaGeneratorTest.scala
@@ -24,7 +24,7 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class BasicJavaGeneratorTest extends FlatSpec with ShouldMatchers {

diff --git a/src/test/scala/CodegenConfigTest.scala b/src/test/scala/CodegenConfigTest.scala
@@ -23,7 +23,7 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class CodegenConfigTest extends FlatSpec with ShouldMatchers {

diff --git a/src/test/scala/CodegenTest.scala b/src/test/scala/CodegenTest.scala
@@ -23,7 +23,7 @@ import org.scalatest.junit.JUnitRunner
 import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class CodegenTest extends FlatSpec with ShouldMatchers {

diff --git a/src/test/scala/swaggerSpec1_1/UtilsTest.scala b/src/test/scala/swaggerSpec1_1/UtilsTest.scala
@@ -24,7 +24,7 @@ import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.JavaConverters._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class ResourceExtractorTest extends FlatSpec with ShouldMatchers {

diff --git a/src/test/scala/swaggerSpec1_2/UtilsTest.scala b/src/test/scala/swaggerSpec1_2/UtilsTest.scala
@@ -24,7 +24,7 @@ import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 
 import scala.collection.JavaConverters._
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 
 @RunWith(classOf[JUnitRunner])
 class ResourceExtractorTest extends FlatSpec with ShouldMatchers {