Merge "Fix Some Bugs"

[holmes/engine-management.git] / engine-d / pom.xml

diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 2b334e6..d5a3160 100644 (file)
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -46,6 +46,16 @@
         <dependency>
             <groupId>org.onap.holmes.dsa</groupId>
             <artifactId>dmaap-dsa</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.onap.holmes.common</groupId>
+                    <artifactId>holmes-actions</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.onap.holmes.common</groupId>
@@ -92,7 +102,6 @@
             <artifactId>drools-templates</artifactId>
             <version>${drools.version}</version>
         </dependency>
-
         <dependency>
             <groupId>io.dropwizard</groupId>
             <artifactId>dropwizard-db</artifactId>
@@ -167,7 +176,6 @@
             <version>1.6.5</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -205,6 +213,12 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>org.onap.holmes.dsa:dmaap-dsa</artifact>
+                            <excludes>
+                                <exclude>org/onap/holmes/common/**</exclude>
+                            </excludes>
+                        </filter>
                     </filters>
                 </configuration>
                 <executions>