BGPCEP distribution package fix

Multiple bundles added to distribution package

Change-Id: Ia38323e7dfcca3313f90f2373828ce04666f2d31
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>

diff --git a/commons/distributions/bgpcep-controller/pom.xml b/commons/distributions/bgpcep-controller/pom.xml
index 80c200e872f2b14a53dc3d3060c49810a83c6365..f17921d553fcceaef1a88ada2c51e0cdd41c1a53 100644 (file)
--- a/commons/distributions/bgpcep-controller/pom.xml
+++ b/commons/distributions/bgpcep-controller/pom.xml
@@ -1003,11 +1003,6 @@
                 <artifactId>commons.httpclient</artifactId>
                 <version>${commons.httpclient.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>sanitytest</artifactId>
-                <version>${controller.version}</version>
-            </dependency>
 
             <!-- equinox http service bridge -->
             <dependency>
@@ -1076,6 +1071,21 @@
                 <artifactId>sal-common-impl</artifactId>
                 <version>${controller.mdsal.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-binding-api</artifactId>
+                <version>${controller.mdsal.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-binding-config</artifactId>
+                <version>${controller.mdsal.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sal-binding-broker-impl</artifactId>
+                <version>${controller.mdsal.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-compatibility</artifactId>
@@ -1713,6 +1723,11 @@
                     <artifactId>sal-core-spi</artifactId>
                     <version>${controller.mdsal.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>sal-broker-impl</artifactId>
+                    <version>${controller.mdsal.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>sal-common-api</artifactId>
@@ -1723,6 +1738,21 @@
                     <artifactId>sal-common-impl</artifactId>
                     <version>${controller.mdsal.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>sal-binding-api</artifactId>
+                    <version>${controller.mdsal.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>sal-binding-config</artifactId>
+                    <version>${controller.mdsal.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>sal-binding-broker-impl</artifactId>
+                    <version>${controller.mdsal.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>sal-compatibility</artifactId>
@@ -1792,6 +1822,11 @@
                     <groupId>org.opendaylight.yangtools.model</groupId>
                     <artifactId>ietf-topology</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>sal-binding-util</artifactId>
+                    <version>1.1-SNAPSHOT</version>
+                </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller.md</groupId>
                     <artifactId>statistics-manager</artifactId>
@@ -1958,6 +1993,11 @@
                     <artifactId>threadpool-config-api</artifactId>
                     <version>${controller.config.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>netty-config-api</artifactId>
+                    <version>${controller.config.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>threadpool-config-impl</artifactId>
@@ -1979,7 +2019,11 @@
                     <version>${controller.config.version}</version>
                 </dependency>
 
-                <!-- yangtools dependencies I'm pretty sure we can trim -->
+                <dependency>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-binding</artifactId>
+                <version>${yangtools.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>binding-type-provider</artifactId>
@@ -2636,6 +2680,10 @@
             <groupId>org.codehaus.jettison</groupId>
             <artifactId>jettison</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>

diff --git a/commons/distributions/bgpcep-controller/src/assemble/bin.xml b/commons/distributions/bgpcep-controller/src/assemble/bin.xml
index 3ee82b28bef0edb33c0fe75515f1a4d90bb076ce..b23d91abf83ae40a3c8f66ab73c08eb692eaa205 100644 (file)
--- a/commons/distributions/bgpcep-controller/src/assemble/bin.xml
+++ b/commons/distributions/bgpcep-controller/src/assemble/bin.xml
@@ -27,7 +27,6 @@
                 <exclude>com.sun.jersey:jersey-core</exclude>
                 <exclude>com.sun.jersey:jersey-server</exclude>
                 <exclude>org.opendaylight.controller:logging.bridge</exclude>
-                <exclude>org.opendaylight.controller:sanitytest</exclude>
             </excludes>
             <outputFileNameMapping>
                 ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 2f917f4091e03e2dbe29e024e58c89a9130b3b5c..1988293ed5ab888d34ea38d7320e8aff0e5fe5f1 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -104,14 +104,15 @@
                 <version>${yangtools.version}</version>
                 <scope>test</scope>
             </dependency>
+            
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
-                <scope>test</scope>
             </dependency>
 
             <!-- Supporting Libraries -->
+            
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -199,8 +200,7 @@
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-broker-impl</artifactId>
                 <version>${controller.mdsal.version}</version>
-                <scope>test</scope>
-            </dependency>
+                </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-binding-util</artifactId>
@@ -210,7 +210,6 @@
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>sal-broker-impl</artifactId>
                 <version>${controller.mdsal.version}</version>
-                <scope>test</scope>
             </dependency>
 
             <!-- Models -->