Merge dev/fluorine work across to master

[unimgr.git] / features / odl-unimgr / pom.xml

diff --git a/features/odl-unimgr/pom.xml b/features/odl-unimgr/pom.xml
old mode 100755 (executable)
new mode 100644 (file)
index 8571706..3241ade
--- a/features/odl-unimgr/pom.xml
+++ b/features/odl-unimgr/pom.xml
@@ -3,13 +3,12 @@
   This program and the accompanying materials are made available under the 
   terms of the Eclipse Public License v1.0 which accompanies this distribution, 
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<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">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.0.2</version>
-    <relativePath />
+    <version>3.1.2</version>
+    <relativePath/>
   </parent>
   <groupId>org.opendaylight.unimgr</groupId>
   <artifactId>odl-unimgr</artifactId>
@@ -20,23 +19,23 @@
   <modelVersion>4.0.0</modelVersion>
 
   <properties>
-    <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
-    <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
-    <restconf.version>1.7.0-SNAPSHOT</restconf.version>
-    <yangtools.version>2.0.0</yangtools.version>
-    <dlux.version>0.7.0-SNAPSHOT</dlux.version>
-    <dluxapps.version>0.7.0-SNAPSHOT</dluxapps.version>
-    <ovsdb.version>1.6.0-SNAPSHOT</ovsdb.version>
-    <netvirt.version>0.6.0-SNAPSHOT</netvirt.version>
-    <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.4.0-SNAPSHOT</netconf.version>
-    <genius.version>0.4.0-SNAPSHOT</genius.version>
-    <l2switch.version>0.7.0-SNAPSHOT</l2switch.version>
-    <openflowplugin.version>0.6.0-SNAPSHOT</openflowplugin.version>
-    <openflowjava.version>0.11.0-SNAPSHOT</openflowjava.version>
-    <ovsdb.version>1.6.0-SNAPSHOT</ovsdb.version>
+    <controller.mdsal.version>1.8.0-SNAPSHOT</controller.mdsal.version>
   </properties>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*SingleFeatureTest.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -45,27 +44,6 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>odl-ovsdb-southbound-impl</artifactId>
-      <version>${ovsdb.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.unimgr</groupId>
-      <artifactId>odl-unimgr-api</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-netconf-topology</artifactId>
-      <version>${netconf.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.unimgr</groupId>
       <artifactId>unimgr-impl</artifactId>