Merge branch 'master' of https://github.com/eugenp/tutorials

Conflicts: spring-rest/pom.xml spring-rest/src/main/webapp/WEB-INF/web.xml
2015-07-23 16:55:44 +03:00
parent a1e7be16b8 cce68e0a7e
commit 6c6cc61caf
7 changed files with 163 additions and 11 deletions
@@ -153,6 +153,12 @@
            <scope>test</scope>
        </dependency>

+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+
    </dependencies>

    <build>