Updated Branches: refs/heads/develop ccbd35865 -> 727bd6e52
removed remaining dependencies to wrong el-api Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/727bd6e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/727bd6e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/727bd6e5 Branch: refs/heads/develop Commit: 727bd6e52556544b1e7d44fcd6d5a54337f2d3d6 Parents: ccbd358 Author: Sebastian Schaffert <[email protected]> Authored: Thu May 16 17:28:40 2013 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Thu May 16 17:28:40 2013 +0200 ---------------------------------------------------------------------- parent/pom.xml | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/727bd6e5/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9726ef9..345a209 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -812,7 +812,13 @@ <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>1.1-PRD</version> + <version>1.1</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.weld</groupId> @@ -842,6 +848,12 @@ <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> <version>${weld.core.version}</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.weld.servlet</groupId>
