Merge remote-tracking branch 'upstream/master'

This commit is contained in:
DOHA
2014-12-21 23:25:08 +02:00
31 changed files with 156 additions and 155 deletions

View File

@@ -207,7 +207,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.version>4.1.3.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
@@ -228,9 +228,9 @@
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
<junit.version>4.11</junit.version>
<mockito.version>1.10.8</mockito.version>
<mockito.version>1.10.17</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpcore.version>4.4</httpcore.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.4.0</rest-assured.version>
@@ -242,8 +242,8 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
<maven-war-plugin.version>2.5</maven-war-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.10</cargo-maven2-plugin.version>
<maven-surefire-plugin.version>2.18</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.11</cargo-maven2-plugin.version>
</properties>