Merge branch 'develop' into report-coverage-results-to-coveralls

This commit is contained in:
Paul Campbell 2016-06-02 21:36:23 +01:00
commit 8b7c49bc31

View file

@ -36,7 +36,7 @@
<subethasmtp.version>3.1.7</subethasmtp.version> <subethasmtp.version>3.1.7</subethasmtp.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<mockito-core.version>1.10.19</mockito-core.version> <mockito-core.version>1.10.19</mockito-core.version>
<simple-java-mail.version>3.0.1</simple-java-mail.version> <simple-java-mail.version>3.1.1</simple-java-mail.version>
<spring-framework.version>4.2.6.RELEASE</spring-framework.version> <spring-framework.version>4.2.6.RELEASE</spring-framework.version>
<coveralls-maven-plugin.version>4.2.0</coveralls-maven-plugin.version> <coveralls-maven-plugin.version>4.2.0</coveralls-maven-plugin.version>
</properties> </properties>