Merge "Make mdsal datastore persist through different sessions"

[netconf.git] / opendaylight / netconf / pom.xml

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index cf719572ac52705c9ca18280f7364f9b6131084a..657819072e44aaedc1bb33f69ad6236f67b82ebc 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -20,6 +20,7 @@
     <module>config-netconf-connector</module>
     <module>mdsal-netconf-connector</module>
     <module>mdsal-netconf-monitoring</module>
+    <module>mdsal-netconf-notification</module>
     <module>netconf-util</module>
     <module>netconf-netty-util</module>
     <module>netconf-mapping-api</module>
@@ -34,6 +35,9 @@
     <module>aaa-authn-odl-plugin</module>
     <module>netconf-notifications-impl</module>
     <module>netconf-notifications-api</module>
+    <module>netconf-topology</module>
+    <module>abstract-topology</module>
+    <module>netconf-topology-config</module>
     <module>sal-netconf-connector</module>
     <module>messagebus-netconf</module>
     <module>models</module>
@@ -61,27 +65,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>aaa-artifacts</artifactId>
-        <version>${aaa.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${config.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
@@ -106,27 +89,27 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-api</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-config</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-impl</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-spi</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>messagebus-util</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
       </dependency>
 
       <dependency>
@@ -145,7 +128,7 @@
         <version>${exi.nagasena.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
+        <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>maven-sal-api-gen-plugin</artifactId>
         <version>${yangtools.version}</version>
       </dependency>