diff --git a/.gitignore b/.gitignore index b17bf46aa10..ae4c9e53c36 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ target .lib atlassian-ide-plugin.xml .DS_Store +*~ diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml index bb7b19f64c1..fdd9eae1ba3 100644 --- a/samples/client/petstore/scala/pom.xml +++ b/samples/client/petstore/scala/pom.xml @@ -188,25 +188,34 @@ + + scala_2.11 + + 2.11.2 + 2.11 + 1.3.10 + 2.2.2 + + scala_2.10 + + true + 2.10.3 2.10 - 1.3.2 + 1.3.10 2.1.2 scala_2.9.1 - - true - 2.9.1-1 2.9.1 - 1.1.0 - 1.6.1 + 1.3.1 + 1.9.2 @@ -215,7 +224,7 @@ 4.8.1 1.0.0 4.8.1 - 3.1.5 + 3.2.0 diff --git a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala index adae715b462..c06a2072998 100644 --- a/samples/client/petstore/scala/src/test/scala/PetApiTest.scala +++ b/samples/client/petstore/scala/src/test/scala/PetApiTest.scala @@ -30,7 +30,7 @@ class PetApiTest extends FlatSpec with Matchers { Category(1, "sold"), "dragon", (for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList, - (for (i <- (1 to 5)) yield Tag(i, "tag-" + i)).toList, + (for (i <- (1 to 5)) yield com.wordnik.petstore.model.Tag(i, "tag-" + i)).toList, "lost" ) @@ -55,7 +55,7 @@ class PetApiTest extends FlatSpec with Matchers { Category(1, "sold"), "programmer", (for (i <- (1 to 10)) yield "http://foo.com/photo/" + i).toList, - (for (i <- (1 to 5)) yield Tag(i, "tag-" + i)).toList, + (for (i <- (1 to 5)) yield com.wordnik.petstore.model.Tag(i, "tag-" + i)).toList, "confused" ) @@ -101,4 +101,4 @@ class PetApiTest extends FlatSpec with Matchers { case None => fail("didn't find pets by tag") } } -} \ No newline at end of file +} diff --git a/src/main/resources/scala/pom.mustache b/src/main/resources/scala/pom.mustache index 4cb2c261fad..d5ad2d05a09 100644 --- a/src/main/resources/scala/pom.mustache +++ b/src/main/resources/scala/pom.mustache @@ -188,25 +188,34 @@ + + scala_2.11 + + 2.11.2 + 2.11 + 1.3.10 + 2.2.2 + + scala_2.10 + + true + 2.10.3 2.10 - 1.3.2 + 1.3.10 2.1.2 scala_2.9.1 - - true - 2.9.1-1 2.9.1 - 1.1.0 - 1.6.1 + 1.3.1 + 1.9.2 @@ -215,6 +224,6 @@ 4.8.1 1.0.0 4.8.1 - 3.1.5 + 3.2.0