You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/01/10 12:22:06 UTC
[08/16] struts git commit: Fixes dependency clash
Fixes dependency clash
(cherry picked from commit 6622fab25bee1dae9085cca56b87711f3197916d)
Conflicts:
apps/showcase/pom.xml
plugins/bean-validation/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/27aa7e1e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/27aa7e1e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/27aa7e1e
Branch: refs/heads/support-2-3
Commit: 27aa7e1e27546effcfc1e4214d231b4a31263fb5
Parents: f19e4be
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Sat Nov 28 15:39:47 2015 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Sat Nov 28 15:39:47 2015 +0100
----------------------------------------------------------------------
plugins/tiles/pom.xml | 7 +++----
pom.xml | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/27aa7e1e/plugins/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml
index 6e872ee..2642b07 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>
http://git-wip-us.apache.org/repos/asf/struts/blob/27aa7e1e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7f45aea..f6b5ada 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>