From b5fd5b5d6b3f522b248b91c1a5f9e02785f10e29 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 26 Feb 2012 11:49:56 +0100
Subject: [PATCH] fix maven conflict

---
 scm-webapp/pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 30625c2ada..1364d98876 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -197,6 +197,17 @@
       <groupId>org.codehaus.enunciate</groupId>
       <artifactId>enunciate-jersey-rt</artifactId>
       <version>${enunciate.version}</version>
+      <!-- fix conflict with jersey-json -->
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-jaxrs</artifactId>
+          <groupId>org.codehaus.jackson</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jackson-xc</artifactId>
+          <groupId>org.codehaus.jackson</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- test scope -->