Merge pull request #303 from butlermh/master

Can't run ./bin/scala-petstore.sh as instructed at README

Author: fehguy

.gitignore

@@ -28,3 +28,4 @@ target
 .lib
 atlassian-ide-plugin.xml
 .DS_Store
+*~

samples/client/petstore/scala/pom.xml

@@ -188,25 +188,34 @@
     </dependency>
   </dependencies>
     <profiles>
+        <profile>
+            <id>scala_2.11</id>
+            <properties>
+                <scala-version>2.11.2</scala-version>
+                <scala-short-version>2.11</scala-short-version>
+                <swagger-core-version>1.3.10</swagger-core-version>
+                <scala-test-version>2.2.2</scala-test-version>
+            </properties>
+        </profile>
         <profile>
             <id>scala_2.10</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <scala-version>2.10.3</scala-version>
                 <scala-short-version>2.10</scala-short-version>
-                <swagger-core-version>1.3.2</swagger-core-version>
+                <swagger-core-version>1.3.10</swagger-core-version>
                 <scala-test-version>2.1.2</scala-test-version>
             </properties>
         </profile>
         <profile>
             <id>scala_2.9.1</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <scala-version>2.9.1-1</scala-version>
                 <scala-short-version>2.9.1</scala-short-version>
-                <swagger-core-version>1.1.0</swagger-core-version>
-                <scala-test-version>1.6.1</scala-test-version>
+                <swagger-core-version>1.3.1</swagger-core-version>
+                <scala-test-version>1.9.2</scala-test-version>
             </properties>
         </profile>
     </profiles>
@@ -215,7 +224,7 @@
     <junit-version>4.8.1</junit-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <junit-version>4.8.1</junit-version>
-    <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
+    <scala-maven-plugin-version>3.2.0</scala-maven-plugin-version>
   </properties>
 </project>
 

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")
     }
   }
-}
+}

src/main/resources/scala/pom.mustache

@@ -188,25 +188,34 @@
     </dependency>
   </dependencies>
     <profiles>
+        <profile>
+            <id>scala_2.11</id>
+            <properties>
+                <scala-version>2.11.2</scala-version>
+                <scala-short-version>2.11</scala-short-version>
+                <swagger-core-version>1.3.10</swagger-core-version>
+                <scala-test-version>2.2.2</scala-test-version>
+            </properties>
+        </profile>
         <profile>
             <id>scala_2.10</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <scala-version>2.10.3</scala-version>
                 <scala-short-version>2.10</scala-short-version>
-                <swagger-core-version>1.3.2</swagger-core-version>
+                <swagger-core-version>1.3.10</swagger-core-version>
                 <scala-test-version>2.1.2</scala-test-version>
             </properties>
         </profile>
         <profile>
             <id>scala_2.9.1</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <properties>
                 <scala-version>2.9.1-1</scala-version>
                 <scala-short-version>2.9.1</scala-short-version>
-                <swagger-core-version>1.1.0</swagger-core-version>
-                <scala-test-version>1.6.1</scala-test-version>
+                <swagger-core-version>1.3.1</swagger-core-version>
+                <scala-test-version>1.9.2</scala-test-version>
             </properties>
         </profile>
     </profiles>
@@ -215,6 +224,6 @@
     <junit-version>4.8.1</junit-version>
     <maven-plugin.version>1.0.0</maven-plugin.version>
     <junit-version>4.8.1</junit-version>
-    <scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>
+    <scala-maven-plugin-version>3.2.0</scala-maven-plugin-version>
   </properties>
 </project>