- fixed deletion result relates objects

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 009a1f5b48bd42d9bf360e8a1ce1c0bec6289d94..3c4e1510156f65d1cfdbfabfd0742005771a8da3 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1114,7 +1114,7 @@
         <version>0.8.7</version>
       </dependency>
       <dependency>
-          <!-- used in eu.etaxonomy.cdm.io.markup -->
+          <!-- used in eu.etaxonomy.cdm.io.markup and for swagger -->
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
           <version>15.0</version>
@@ -1242,17 +1242,6 @@
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-search-engine</artifactId>
         <version>4.2.0.Final</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-          </exclusion>
-          <exclusion>
-            <!-- exclude to avoid conficts with swagger -->
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.javassist</groupId>
@@ -1536,6 +1525,20 @@
         <groupId>com.mangofactory</groupId>
         <artifactId>swagger-springmvc</artifactId>
         <version>0.8.5</version>
+                <exclusions>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+          </exclusion>
+<!--           <exclusion>  -currently not referenced by any other project
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+          </exclusion> -->
+        </exclusions>
       </dependency>
       <!-- dependencies for swagger-springmvc, added explicitely -->
       <dependency>