From 719f467d27fbd4f9934c5859fe447127ae8a238b Mon Sep 17 00:00:00 2001
From: Alejandro Gervasio <electricalweb@yahoo.com.ar>
Date: Tue, 9 Oct 2018 14:50:10 -0300
Subject: [PATCH] Update pom.xml

---
 javaxval/pom.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/javaxval/pom.xml b/javaxval/pom.xml
index 32b0878ce8..f0b089bbdf 100644
--- a/javaxval/pom.xml
+++ b/javaxval/pom.xml
@@ -27,11 +27,6 @@
             <artifactId>hibernate-validator-annotation-processor</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>${javax.el-api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.web</groupId>
             <artifactId>javax.el</artifactId>
@@ -60,19 +55,11 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    	
     <properties>
         <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
+<org.springframework.version>5.0.2.RELEASE</org.springframework.version>       <org.springframework.version>5.0.2.RELEASE</org.springframework.version>
         <junit.version>4.12</junit.version>
         <assertj.version>3.11.1</assertj.version>
     </properties>