mindol1004/spring-boot-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/jgarciaheredero/tutorials into jgarciaheredero-master

Browse Source 
# Conflicts:
#	spring-mvc-java/pom.xml
This commit is contained in:
Grzegorz Piwowarek
2016-10-04 17:02:21 +02:00
parent ee3db42880 08c31ec84b
commit 8a3c918b94
6 changed files with 211 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-mvc-java/pom.xml
View File

@@ -250,7 +250,7 @@
<!-- logging -->
<org.slf4j.version>1.7.21</org.slf4j.version>
<logback.version>1.1.5</logback.version>
<!-- various -->
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
<!-- util -->
@@ -263,6 +263,7 @@
<httpcore.version>4.4.1</httpcore.version>
<httpclient.version>4.5</httpclient.version>
<rest-assured.version>2.9.0</rest-assured.version>
<net.sourceforge.htmlunit>2.23</net.sourceforge.htmlunit>
<!-- maven plugins -->
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.6</maven-war-plugin.version>
@@ -274,4 +275,5 @@
<aspectj.version>1.8.7</aspectj.version>
</properties>
</project>
</project>