Update pom.xml

This commit is contained in:
Alejandro Gervasio 2018-10-09 14:50:10 -03:00
parent f00e8b3e3d
commit 719f467d27
1 changed files with 1 additions and 14 deletions

View File

@ -27,11 +27,6 @@
<artifactId>hibernate-validator-annotation-processor</artifactId> <artifactId>hibernate-validator-annotation-processor</artifactId>
<version>${hibernate-validator.version}</version> <version>${hibernate-validator.version}</version>
</dependency> </dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>${javax.el-api.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.glassfish.web</groupId> <groupId>org.glassfish.web</groupId>
<artifactId>javax.el</artifactId> <artifactId>javax.el</artifactId>
@ -60,19 +55,11 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<validation-api.version>2.0.1.Final</validation-api.version> <validation-api.version>2.0.1.Final</validation-api.version>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.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>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> <org.springframework.version>5.0.2.RELEASE</org.springframework.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> <junit.version>4.12</junit.version>
<assertj.version>3.11.1</assertj.version> <assertj.version>3.11.1</assertj.version>
</properties> </properties>