From f4bf7591ff71e8f9b68891ab068202bae6b159d5 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukasz.lenart@gmail.com>
Date: Fri, 27 Nov 2015 16:09:37 +0100
Subject: [PATCH] Fixes dependency clash

---
 apps/showcase/pom.xml           | 5 -----
 plugins/bean-validation/pom.xml | 1 -
 plugins/tiles/pom.xml           | 7 +++----
 pom.xml                         | 7 +++----
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 7173275e0..4e6044beb 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -171,11 +171,6 @@
             <artifactId>hibernate-validator</artifactId>
             <version>5.1.3.Final</version>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>3.0.0</version>
-        </dependency>
 
         <!-- The Servlet API mocks in Spring Framework 4.x only supports Servlet 3.0 and higher.
            This is only necessary in tests-->
diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
index b7318efe8..f2500c52b 100644
--- a/plugins/bean-validation/pom.xml
+++ b/plugins/bean-validation/pom.xml
@@ -58,7 +58,6 @@
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.el</artifactId>
-            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 57d083f55..45a9b7e68 100644
--- a/plugins/tiles/pom.xml
+++ b/plugins/tiles/pom.xml
@@ -73,11 +73,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.glassfish</groupId>
+            <artifactId>javax.el</artifactId>
+            <optional>true</optional>
         </dependency>
-
     </dependencies>
     <properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/pom.xml b/pom.xml
index def253947..d5489ec6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -577,10 +577,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.el</groupId>
-                <artifactId>el-api</artifactId>
-                <version>1.0</version>
-                <scope>provided</scope>
+                <groupId>org.glassfish</groupId>
+                <artifactId>javax.el</artifactId>
+                <version>3.0.0</version>
             </dependency>
 
             <dependency>