X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Frestconf%2Fpom.xml;h=db5cb3c5fec32ff30a90f80fea140eda0ac43c14;hb=c9e94ddcd19f8ca0ca22c11e44371230a14729a8;hp=df2201cc2ed524891c2eff50b16299d08b846726;hpb=bc0eccef5109674b453f917cd1f73aa4dbe2bfab;p=netconf.git

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index df2201cc2e..db5cb3c5fe 100644
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -12,23 +12,23 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <artifactId>features-restconf</artifactId>
   <groupId>org.opendaylight.netconf</groupId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <properties>
-    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <aaa.version>0.4.0-SNAPSHOT</aaa.version>
+    <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+    <features.test.version>1.7.0-SNAPSHOT</features.test.version>
+    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <surefire.version>2.15</surefire.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
 
     <features.file>features.xml</features.file>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@ -36,11 +36,42 @@
     <config.restconf.service.configfile>10-restconf-service.xml</config.restconf.service.configfile>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-artifacts</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <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.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>features-odlparent</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -61,7 +92,6 @@
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa-shiro</artifactId>
-      <version>${aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -94,30 +124,6 @@
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-servlet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
@@ -171,7 +177,6 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-codec-gson</artifactId>
-      <version>${yangtools.version}</version>
     </dependency>
 
     <dependency>
@@ -180,22 +185,6 @@
       <version>${restconf.version}</version>
     </dependency>
 
-    <!-- dependency for opendaylight-karaf-empty for use by testing -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>${commons.opendaylight.version}</version>
-      <scope>test</scope>
-      <type>zip</type>
-    </dependency>
-    <!-- Uncomment this if you get an error : java.lang.NoSuchMethodError: org.slf4j.helpers.MessageFormatter.format(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple;
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.7.2</version>
-    </dependency>
-    -->
-
   </dependencies>
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>