X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fnetconf%2Ffeatures-netconf%2Fpom.xml;h=8053acef53c0c35def2396c024272380c5d4d73e;hb=effdc431d42558c582b8879a08239c9975980fba;hp=44d39ec27b3d7fd4dd0574bd6e391ba8adf01162;hpb=3d7090c8bf0df8c9814b7d3cb2c43dff483a5c7a;p=netconf.git

diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml
index 44d39ec27b..8053acef53 100644
--- a/features/netconf/features-netconf/pom.xml
+++ b/features/netconf/features-netconf/pom.xml
@@ -6,135 +6,131 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>2.0.0</version>
+    <version>4.0.10</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.6.1-SNAPSHOT</version>
   <packaging>feature</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.aaa</groupId>
+        <artifactId>aaa-artifacts</artifactId>
+        <version>0.9.1-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-aaa-netconf-plugin</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>odl-aaa-encryption-service</artifactId>
       <classifier>features</classifier>
+      <type>xml</type>
     </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>odl-aaa-netconf-plugin-no-cluster</artifactId>
-      <version>${project.version}</version>
+      <artifactId>odl-aaa-netconf-plugin</artifactId>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>odl-config-netconf-connector</artifactId>
-      <version>${project.version}</version>
+      <artifactId>odl-aaa-netconf-plugin-no-cluster</artifactId>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-all</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-api</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-client</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-impl</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-mapping-api</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-mdsal</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-netconf-monitoring</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-netty-util</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-notifications-api</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-notifications-impl</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-ssh</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-tcp</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-netconf-util</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>