Move openflowplugin-parent

[openflowplugin.git] / features / pom.xml

diff --git a/features/pom.xml b/features/pom.xml
index 4721d60586f39b1b59305eb8631aef3d60be6094..cb8dedfd6d976094931558d6a1761b6152067831 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>features-openflowplugin</artifactId>
 
@@ -14,9 +14,9 @@
   <properties>
     <features.file>features.xml</features.file>
     <karaf.empty.distro.version>1.5.0-SNAPSHOT</karaf.empty.distro.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
+    <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
   </properties>
 
   <dependencies>
@@ -75,27 +75,22 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>forwardingrules-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>inventory-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>lldp-speaker</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>statistics-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>statistics-manager-config</artifactId>
-      <version>${project.version}</version>
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
@@ -111,7 +106,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-netconf-connector</artifactId>
-      <version>${netconf.version}</version>
+      <version>${mdsal.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -120,27 +115,22 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-extension-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>table-miss-enforcer</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>table-miss-enforcer</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
@@ -148,31 +138,26 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>topology-lldp-discovery</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>topology-manager</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
-      <dependency>
-          <groupId>org.opendaylight.openflowplugin.applications</groupId>
-          <artifactId>of-switch-config-pusher</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.openflowplugin.applications</groupId>
-          <artifactId>of-switch-config-pusher</artifactId>
-          <version>${project.version}</version>
-          <type>xml</type>
-          <classifier>config</classifier>
-      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>of-switch-config-pusher</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>of-switch-config-pusher</artifactId>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
 
     <dependency>
       <groupId>org.opendaylight.openflowplugin.applications</groupId>
       <artifactId>lldp-speaker</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
@@ -180,24 +165,20 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>drop-test-karaf</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>test-common</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-controller-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-controller-config</artifactId>
-      <version>${project.version}</version>
       <type>xml</type>
       <classifier>configmsgspy</classifier>
     </dependency>