X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Ffeatures%2Fnetconf%2Fpom.xml;fp=features%2Fnetconf%2Fpom.xml;h=90b4851c7e3266dacd17b349f658b2b9009cbf4c;hp=7200425e7edc171c2974bd8f6649a4b3710e30f3;hb=refs%2Fchanges%2F13%2F23413%2F26;hpb=071a641d7c12c0e6112d5ce0afe806b54f116ed2

diff --git a/features/netconf/pom.xml b/opendaylight/netconf/features/netconf/pom.xml
similarity index 77%
rename from features/netconf/pom.xml
rename to opendaylight/netconf/features/netconf/pom.xml
index 7200425e7e..90b4851c7e 100644
--- a/features/netconf/pom.xml
+++ b/opendaylight/netconf/features/netconf/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>netconf-subsystem</artifactId>
     <version>0.4.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/netconf</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
   <artifactId>features-netconf</artifactId>
 
@@ -16,6 +16,14 @@
   </properties>
 
   <dependencies>
+    <!-- FIXME AAA netconf dependency loop-->
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-aaa</artifactId>
+      <version>${aaa.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-config</artifactId>
@@ -30,6 +38,13 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-config-persister</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-api</artifactId>
@@ -90,6 +105,11 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-impl</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-manager-facade-xml</artifactId>
+      <version>${config.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>config-netconf-connector</artifactId>
@@ -140,7 +160,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-connector-config</artifactId>
-      <version>${config.version}</version>
+      <version>${netconf.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
@@ -148,6 +168,20 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>netconf-monitoring</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>mdsal-netconf-monitoring</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>mdsal-netconf-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>netconf-mdsal-config</artifactId>
+      <classifier>config</classifier>
+      <type>xml</type>
+    </dependency>
     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
@@ -206,21 +240,22 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${surefire.version}</version>
-        <configuration>
-          <systemPropertyVariables>
-            <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-            <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-            <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
-          </systemPropertyVariables>
-          <dependenciesToScan>
-            <dependency>org.opendaylight.odlparent:features-test</dependency>
-          </dependenciesToScan>
-        </configuration>
-      </plugin>
+      <!-- FIXME uncomment after merge -->
+      <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-surefire-plugin</artifactId>-->
+        <!--<version>${surefire.version}</version>-->
+        <!--<configuration>-->
+          <!--<systemPropertyVariables>-->
+            <!--<karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>-->
+            <!--<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>-->
+            <!--<karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>-->
+          <!--</systemPropertyVariables>-->
+          <!--<dependenciesToScan>-->
+            <!--<dependency>org.opendaylight.odlparent:features-test</dependency>-->
+          <!--</dependenciesToScan>-->
+        <!--</configuration>-->
+      <!--</plugin>-->
     </plugins>
   </build>
   <scm>