Fix occasional NPEs in Connection manager

[controller.git] / opendaylight / sal / yang-prototype / sal / sal-core-demo / pom.xml

diff --git a/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml
index 91dd78c1440a40128983bbca49ea38050ec5d3d9..a99425c5284b6c3604e6e8fc288a21d4f61fe3ca 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/sal-core-demo/pom.xml
@@ -3,14 +3,19 @@
        <modelVersion>4.0.0</modelVersion>\r
        <parent>\r
                <groupId>org.opendaylight.controller</groupId>\r
-               <artifactId>sal</artifactId>\r
+               <artifactId>sal-parent</artifactId>\r
                <version>1.0-SNAPSHOT</version>\r
        </parent>\r
        <artifactId>sal-core-demo</artifactId>\r
+    <scm>\r
+      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>\r
+    </scm>\r
 \r
        <dependencies>\r
                <dependency>\r
-               \r
+\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>sal-broker-impl</artifactId>\r
                        <version>1.0-SNAPSHOT</version>\r
@@ -18,7 +23,6 @@
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-data-util</artifactId>\r
-                       <version>1.0</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.slf4j</groupId>\r
@@ -26,5 +30,34 @@
                        <version>1.7.2</version>\r
                        <scope>runtime</scope>\r
                </dependency>\r
-       </dependencies>
-</project>
\ No newline at end of file
+       </dependencies>\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <artifactId>maven-assembly-plugin</artifactId>\r
+                               <version>2.4</version>\r
+                               <configuration>\r
+                                       <descriptorRefs>\r
+                                               <descriptorRef>jar-with-dependencies</descriptorRef>\r
+                                       </descriptorRefs>\r
+                                       <archive>\r
+                                               <manifest>\r
+                                                       <mainClass>org.opendaylight.controller.sal.demo.SALDemo</mainClass>\r
+                                               </manifest>\r
+                                       </archive>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>make-assembly</id>\r
+                                               <phase>package</phase>\r
+                                               <goals>\r
+                                                       <goal>single</goal>\r
+                                               </goals>\r
+                                       </execution>\r
+                               </executions>\r
+                       </plugin>\r
+\r
+               </plugins>\r
+\r
+       </build>\r
+</project>\r