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 ec1bcce3c564f23461f65ece14cd2fb3c312ea30..657819072e44aaedc1bb33f69ad6236f67b82ebc 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -3,10 +3,10 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <artifactId>netconf-subsystem</artifactId>
@@ -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>
@@ -31,11 +32,14 @@
     <module>netconf-connector-config</module>
     <module>netconf-mdsal-config</module>
     <module>netconf-auth</module>
+    <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>features</module>
     <module>models</module>
     <module>tools</module>
 
@@ -62,21 +66,7 @@
   <dependencyManagement>
     <dependencies>
       <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.controller</groupId>
+        <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
         <version>${netconf.version}</version>
         <type>pom</type>
@@ -90,15 +80,6 @@
         <scope>import</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-protocol-framework</artifactId>
-        <version>${protocol-framework.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-        <scope>runtime</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>protocol-framework</artifactId>
@@ -108,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>
@@ -147,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>
@@ -173,16 +154,4 @@
 
     </dependencies>
   </dependencyManagement>
-
-  <profiles>
-    <profile>
-      <id>integrationtests</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <modules>
-        <module>netconf-it</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>