Merge "Added sal-compability to build"

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index dbc9f756fde3ae9eae35a05fea2acf84d781494a..1bf9a676b8feb1f316b25f9ed6fc87024f737469 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -25,6 +25,8 @@
         <module>samples</module>
         <!-- Base Models -->
         <module>model</module>
+        <!-- Compability Packages -->
+        <module>sal-compability</module>
        </modules>
 
        <properties>

diff --git a/opendaylight/md-sal/sal-compability/pom.xml b/opendaylight/md-sal/sal-compability/pom.xml
index e3d8c589f7e135037ffd57738a0a7e4d700fe7a4..40301a379fe404463adae6e65987fb4260dcbdd9 100644 (file)
--- a/opendaylight/md-sal/sal-compability/pom.xml
+++ b/opendaylight/md-sal/sal-compability/pom.xml
@@ -5,7 +5,6 @@
                <groupId>org.opendaylight.controller</groupId>
                <artifactId>sal-parent</artifactId>
                <version>1.0-SNAPSHOT</version>
-               <relativePath>../../sal/yang-prototype/sal/pom.xml</relativePath>
        </parent>
        <artifactId>sal-compability</artifactId>
 
@@ -38,7 +37,6 @@
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <type>bundle</type>
                        <version>14.0.1</version>
                </dependency>
        </dependencies>