Merge branch 'mvnversion' into 'master'

[irc/rizon/acid.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6413b675855e693d342ae4e53b3650679be9e8b6..18ed2091dd70dd603abe9ff766d2f104c7040d02 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,8 @@
 
                <module>pyva</module>
                <module>trapbot</module>
+               <module>xmas</module>
+               <module>vizon</module>
        </modules>
        
        <dependencyManagement>
@@ -35,6 +37,12 @@
                                <version>4.12</version>
                                <scope>test</scope>
                        </dependency>
+                       <dependency>
+                               <groupId>org.mockito</groupId>
+                               <artifactId>mockito-all</artifactId>
+                               <version>1.10.19</version>
+                               <scope>test</scope>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
 
@@ -43,6 +51,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>
+                               <version>3.7.0</version>
                                <configuration>
                                        <source>1.8</source>
                                        <target>1.8</target>