Merge branch 'develop' into develop

2017-03-02 21:24:09 +01:00
parent 153dc57731 2d6235e4f0
commit f71d02fc6a
9 changed files with 122 additions and 54 deletions
--- a/webgoat-lessons/pom.xml
+++ b/webgoat-lessons/pom.xml
@ -73,6 +73,12 @@
            <artifactId>encoder</artifactId>
            <version>1.2</version>
        </dependency>
+        <!-- Temporarily -->
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>1.4.7</version>
+        </dependency>
    </dependencies>
    <dependencyManagement>
        <dependencies>