Exclude defense4all jars from the plugins dir.

Change-Id: I3cd588f963e6fb4751ca37fb6819c14db4b0f61a
Signed-off-by: Alissa Bonas <abonas@redhat.com>

diff --git a/distributions/virtualization/pom.xml b/distributions/virtualization/pom.xml
index 7143110c742e0271cb5a0917908a61ba0bdbaed1..56a630f6ac5201c1833313e9ff64737b4ac81e88 100644 (file)
--- a/distributions/virtualization/pom.xml
+++ b/distributions/virtualization/pom.xml
@@ -59,14 +59,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 
     <!-- defense4all -->
 
-    <!-- 
-         Note: will not work until groupId is fixed in defense4all project to be 
-         org.opendaylight.defense4all for all artifacts
-
-         Note: These should pull through all other defense for all modules via dependencies
-
-      -->
-
     <dependency>
       <groupId>org.opendaylight.defense4all</groupId>
       <artifactId>defense4all.core.impl</artifactId>

diff --git a/distributions/virtualization/src/assemble/bin.xml b/distributions/virtualization/src/assemble/bin.xml
index b06e147dc61be9939ab0577ef7ae1533d938c399..5c377d165935dedd3389a5ce68e1b6ccbace8fa9 100644 (file)
--- a/distributions/virtualization/src/assemble/bin.xml
+++ b/distributions/virtualization/src/assemble/bin.xml
@@ -33,6 +33,9 @@
         <exclude>com.sun.jersey:jersey-core</exclude>
         <exclude>com.sun.jersey:jersey-json</exclude>
         <exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>org.opendaylight.defense4all:defense4all.core.impl</exclude>
+        <exclude>org.opendaylight.defense4all:framework.core.impl</exclude>
+        <exclude>org.opendaylight.defense4all:defense4all.restservice</exclude>
       </excludes>
       <outputFileNameMapping>
         ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}