Merge release/2.5 into master

This commit is contained in:
Ana Bozianu
2016-09-21 15:12:01 +03:00
12 changed files with 1255 additions and 38 deletions

View File

@@ -173,6 +173,17 @@
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.21</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>