Merge pull request #1312 from lugaru1234/issue1207

Fixes #1207: Deleting scala dependency

Author: fehguy

modules/swagger-jaxrs/pom.xml

@@ -54,11 +54,6 @@
         </plugins>
     </build>
     <dependencies>
-        <dependency>
-            <groupId>org.scalatest</groupId>
-            <artifactId>scalatest_2.10</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -128,12 +123,6 @@
             <version>${logback-version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.scala-lang</groupId>
-            <artifactId>scala-library</artifactId>
-            <version>${scala-version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

modules/swagger-jaxrs/src/test/java/io/swagger/CollectionFormatTest.java

@@ -5,7 +5,7 @@
 import io.swagger.models.Swagger;
 import io.swagger.models.parameters.AbstractSerializableParameter;
 import org.testng.annotations.Test;
-import resources.CollectionFormatResource;
+import io.swagger.resources.CollectionFormatResource;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;

modules/swagger-jaxrs/src/test/java/io/swagger/models/Pet.java

@@ -2,8 +2,6 @@
 
 import io.swagger.annotations.ApiModelProperty;
 
-import models.Category;
-import models.CategoryWithApiModel;
 import io.swagger.models.duplicated.Tag;
 
 import java.util.ArrayList;

…/resources/CollectionFormatResource.java …/resources/CollectionFormatResource.javamodules/swagger-jaxrs/src/test/scala/resources/CollectionFormatResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/CollectionFormatResource.java modules/swagger-jaxrs/src/test/scala/resources/CollectionFormatResource.java renamed to modules/swagger-jaxrs/src/test/java/io/swagger/resources/CollectionFormatResource.java

@@ -1,4 +1,4 @@
-package resources;
+package io.swagger.resources;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;