X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fpom.xml;h=0e31d5ea12feedb8b6948938b906ffbd16e33fbe;hb=1f9e0751e22e3684211991d089bea8dda0c088a8;hp=b84fe986d1a7ec35ccd39e08d616483aec65fe28;hpb=87f52e979d0d48d1560a94ae76706cfae06436a0;p=integration%2Fdistribution.git

diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index b84fe986..0e31d5ea 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -14,12 +14,12 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>karaf</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>opendaylight</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.12.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: integration :: ${project.artifactId}</name>
     <description>The actual Karaf archive building sub-project.</description>
@@ -38,33 +38,16 @@
         <tag>HEAD</tag>
     </scm>
     <profiles>
-        <!-- Honeycomb/VBD -->
-        <profile>
-            <id>vbd</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.honeycomb.vbd</groupId>
-                    <artifactId>vbd-features</artifactId>
-                    <version>1.5.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- SXP -->
+        <!-- JSONRPC -->
         <profile>
-            <id>sxp</id>
+            <id>jsonrpc</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.opendaylight.sxp</groupId>
-                    <artifactId>features-sxp</artifactId>
+                    <groupId>org.opendaylight.jsonrpc</groupId>
+                    <artifactId>jsonrpc-features</artifactId>
                     <version>1.8.0-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
@@ -72,50 +55,16 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- Telemetry -->
+        <!-- TransportPCE -->
         <profile>
-            <id>telemetry</id>
+            <id>transportpce</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.opendaylight.telemetry</groupId>
-                    <artifactId>features-telemetry</artifactId>
-                    <version>0.1.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- TSDR -->
-        <profile>
-            <id>tsdr</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.tsdr</groupId>
-                    <artifactId>features-tsdr</artifactId>
-                    <version>1.7.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <!-- Unimgr -->
-        <profile>
-            <id>unimgr</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.unimgr</groupId>
-                    <artifactId>features4-unimgr</artifactId>
+                    <groupId>org.opendaylight.transportpce</groupId>
+                    <artifactId>features-transportpce</artifactId>
                     <version>0.5.0-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
@@ -123,22 +72,28 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- JSONRPC -->
         <profile>
-            <id>jsonrpc</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.opendaylight.jsonrpc</groupId>
-                    <artifactId>jsonrpc-features</artifactId>
-                    <version>1.6.0-SNAPSHOT</version>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
+            <id>dependency-convergence</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>enforce-dependency-convergence</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <dependencyConvergence/>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 </project>