Updated Branches: refs/heads/MARMOTTA-228 c3221e6ae -> 4d7c52228
MARMOTTA-238: added missing dependencies to import javax.ws.rs.ext.ExceptionMapper Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/89aee639 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/89aee639 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/89aee639 Branch: refs/heads/MARMOTTA-228 Commit: 89aee63937b9d076b05b92768a8b222394a0c654 Parents: c3221e6 Author: Sergio Fernández <[email protected]> Authored: Mon May 20 09:11:59 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon May 20 09:11:59 2013 +0200 ---------------------------------------------------------------------- parent/pom.xml | 15 +++++++++++++-- platform/marmotta-core/pom.xml | 4 ++++ 2 files changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/89aee639/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 0655580..3fac8b7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -772,8 +772,19 @@ </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> + <artifactId>jaxrs-api</artifactId> + <version>2.3.6.Final</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-cdi</artifactId> - <version>2.3.5.Final</version> + <version>2.3.6.Final</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -784,7 +795,7 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jackson-provider</artifactId> - <version>2.3.5.Final</version> + <version>2.3.6.Final</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/89aee639/platform/marmotta-core/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml index a7c7597..2318fb3 100644 --- a/platform/marmotta-core/pom.xml +++ b/platform/marmotta-core/pom.xml @@ -253,6 +253,10 @@ </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> + <artifactId>jaxrs-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-cdi</artifactId> </dependency> <dependency>
