From 27aa7e1e27546effcfc1e4214d231b4a31263fb5 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukasz.lenart@gmail.com>
Date: Sat, 28 Nov 2015 15:39:47 +0100
Subject: [PATCH] Fixes dependency clash

(cherry picked from commit 6622fab25bee1dae9085cca56b87711f3197916d)

Conflicts:
	apps/showcase/pom.xml
	plugins/bean-validation/pom.xml
---
 plugins/tiles/pom.xml | 7 +++----
 pom.xml               | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 6e872ee71..2642b0756 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 7f45aeadb..f6b5ada93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -641,10 +641,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>