iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
DOHA
2014-11-23 21:53:19 +02:00
parent 4c731284ef 6668c11c3c
commit 3450a076da
32 changed files with 132 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-java/pom.xml
+4 -4
View File
@@ -145,12 +145,12 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.1.1.RELEASE</org.springframework.version>
<org.springframework.version>4.1.2.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
<!-- persistence -->
<hibernate.version>4.3.7.Final</hibernate.version>
<mysql-connector-java.version>5.1.32</mysql-connector-java.version>
<mysql-connector-java.version>5.1.34</mysql-connector-java.version>
<!-- marshalling -->
<jackson.version>2.4.2</jackson.version>
@@ -172,9 +172,9 @@
<mockito.version>1.10.8</mockito.version>
<httpcore.version>4.3.3</httpcore.version>
<httpclient.version>4.3.5</httpclient.version>
<httpclient.version>4.3.6</httpclient.version>
<rest-assured.version>2.3.4</rest-assured.version>
<rest-assured.version>2.4.0</rest-assured.version>
<!-- maven plugins -->
<maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>