Fixes dependency clash
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6622fab2 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6622fab2 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6622fab2 Branch: refs/heads/master Commit: 6622fab25bee1dae9085cca56b87711f3197916d Parents: 388861f Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Fri Nov 27 16:09:37 2015 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Fri Nov 27 16:09:37 2015 +0100 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/6622fab2/apps/showcase/pom.xml ---------------------------------------------------------------------- diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 7173275..4e6044b 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--> http://git-wip-us.apache.org/repos/asf/struts/blob/6622fab2/plugins/bean-validation/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml index b7318ef..f2500c5 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> http://git-wip-us.apache.org/repos/asf/struts/blob/6622fab2/plugins/tiles/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 57d083f..45a9b7e 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/6622fab2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index def2539..d5489ec 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>
