Merge branch 'master' into topic/ietf_yang

[lispflowmapping.git] / features / pom.xml

diff --git a/features/pom.xml b/features/pom.xml
index 29375eaf2b1aa8e3ddf1c7a3e15c565547b41633..dfaa8230dd6ad32de2c4d9e5a35c2a1ce0b78169 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -28,11 +28,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
+    <config.version>0.4.0-SNAPSHOT</config.version>
     <dlux.core.version>0.3.0-SNAPSHOT</dlux.core.version>
     <features.file>features.xml</features.file>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <neutron.version>0.6.0-SNAPSHOT</neutron.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <!-- Temporary -->
+    <skipTests>true</skipTests>
   </properties>
 
   <dependencyManagement>
@@ -50,36 +54,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-base</artifactId>
-      <version>${commons.opendaylight.version}</version>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
+      <scope>runtime</scope>
     </dependency>
-<!--     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency> -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
+      <artifactId>features-config</artifactId>
+      <version>${config.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-restconf</artifactId>
+      <artifactId>features-mdsal</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-restconf</artifactId>
+      <version>${restconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -92,6 +91,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <!--
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.implementation</artifactId>
@@ -116,21 +116,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
+    -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
       <version>${project.version}</version>
     </dependency>
-<!--     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.clusterdao</artifactId>
-      <version>${project.version}</version>
-    </dependency> -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.config</artifactId>
-      <version>${project.version}</version>
-    </dependency>
+    <!--
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.inmemorydb</artifactId>
@@ -143,11 +135,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
-<!--     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.netconf</artifactId>
-      <version>${project.version}</version>
-    </dependency> -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.neutron</artifactId>
@@ -158,11 +145,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mappingservice.shell</artifactId>
       <version>${project.version}</version>
     </dependency>
+    -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.lisp-proto</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>lispflowmapping-ui-bundle</artifactId>
@@ -175,11 +164,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
+    -->
   </dependencies>
 </project>