Update pom.xml

This commit is contained in:
Alejandro Gervasio 2018-10-08 14:38:24 -03:00 committed by GitHub
parent f00e8b3e3d
commit 95fdd71e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions

View File

@ -65,15 +65,9 @@
<validation-api.version>2.0.1.Final</validation-api.version>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
<javax.el-api.version>3.0.0</javax.el-api.version>
<<<<<<< HEAD
<javax.el.version>3.0.0</javax.el.version>
<javax.el.version>2.2.6</javax.el.version>
<org.springframework.version>5.0.2.RELEASE</org.springframework.version>
=======
<javax.el.version>3.0.0</javax.el.version>
<org.springframework.version>5.0.2.RELEASE</org.springframework.version>
>>>>>>> 9060d6c3bafc0411cbc7f7234f1ff4d5b6edf535
<junit.version>4.12</junit.version>
<assertj.version>3.11.1</assertj.version>
</properties>
</project>
</project>