Merge dev/fluorine work across to master

[unimgr.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index f146aa246d6c79628d98fdcf18249351923c6788..f25ac2846246909a27b2e708c4fc420a9bd33ae0 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.2</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <karaf.localFeature>odl-unimgr-ui</karaf.localFeature>
+    <karaf.localFeature>odl-unimgr-rest</karaf.localFeature>
   </properties>
   <dependencyManagement>
     <dependencies>