Bump controller to use yangtools 1.2.0

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / pom.xml

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 7563d06c4fb21086a499069f2b740c49c1b4526d..538841ecd5d64b54ad536232a4df6801c17a131e 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -3,15 +3,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <relativePath>../../config/config-parent</relativePath>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>2.0.5</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-remoterpc-connector</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>
@@ -19,7 +19,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
+                <version>1.7.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -61,10 +68,6 @@
             <artifactId>akka-persistence_${scala.version}</artifactId>
         </dependency>
         <!-- SAL Dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-connector-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
@@ -152,6 +155,12 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-akka-raft</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -164,35 +173,10 @@
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-package></Export-package>
-                        <Private-Package></Private-Package>
                         <Import-Package>
-                            !org.iq80.*;
-                            !*snappy;
-                            !org.jboss.*;
-                            !com.jcraft.*;
-                            !org.fusesource.*;
-                            !*jetty*;
-                            !sun.security.*;
                             org.opendaylight.controller.cluster;
                             *
                         </Import-Package>
-                        <!--
-                        <Embed-Dependency>
-                            sal-clustering-commons;
-                            sal-akka-raft;
-                            *metrics*;
-                            !sal*;
-                            !*config-api*;
-                            !*testkit*;
-                            *protobuf*;
-                            akka*;
-                            *scala*;
-                            *config*;
-                            *netty*;
-                            *uncommons*;
-                        </Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                      -->
                     </instructions>
                 </configuration>
             </plugin>