Bump to odlparent 3.1.4 and yangtools 2.0.12

[integration/distribution.git] / features / singles / odl-integration-compatible-with-all / pom.xml

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index f960fc1af2e945c88f879df0fc2597847cf9a354..acd1a0b57ea4d66a62a80aed70c4c0131cceaf3f 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-compatible-with-all</artifactId>
     <!-- TODO: Shorter name? -->
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
@@ -49,18 +49,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <!-- Override odlparent default to get the speed improvements in feature generation
-         FIXME: remove this once odlparent ships 4.1.5+ -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <version>4.1.5</version>
-            </plugin>
-        </plugins>
-    </build>
-
     <!-- User facing single features. Alphabetical order -->
     <profiles>
         <!-- AAA -->