X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=623a06d478a49fe860107fd920baa859b8108942;hb=refs%2Fchanges%2F13%2F37413%2F1;hp=8c9cfd7288fa9aa56e9852a1c4532e9ddcce44a1;hpb=f68d3133ead3dc518b376b18194c1e80c1e4c533;p=integration%2Fdistribution.git

diff --git a/pom.xml b/pom.xml
index 8c9cfd72..623a06d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.integration</groupId>
   <artifactId>root</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.5.0-SNAPSHOT</version>
   <name>integration</name> <!-- Used by Sonar to set project name -->
   <packaging>pom</packaging>
   <url>https://wiki.opendaylight.org/view/CrossProject:Integration_Group</url>
@@ -21,90 +21,73 @@
   </scm>
   <properties>
     <!-- Keep this list sorted alphabetically please -->
-    <didm.version>0.2.0-SNAPSHOT</didm.version>
-    <feature.alto.version>0.2.0-SNAPSHOT</feature.alto.version>
-    <feature.armoury.version>1.0.0-SNAPSHOT</feature.armoury.version>
-    <feature.benchmark.version>1.1.0-SNAPSHOT</feature.benchmark.version>
-    <feature.bgpcep.version>0.5.0-SNAPSHOT</feature.bgpcep.version>
-    <feature.centinel.version>0.1.0-SNAPSHOT</feature.centinel.version>
-    <feature.circuitsw.version>1.0.0-SNAPSHOT</feature.circuitsw.version>
-    <feature.dlux.version>0.3.0-SNAPSHOT</feature.dlux.version>
-    <feature.faas.version>1.0.0-SNAPSHOT</feature.faas.version>
-    <feature.flow.version>1.3.0-SNAPSHOT</feature.flow.version>
-    <feature.groupbasedpolicy.version>0.3.0-SNAPSHOT</feature.groupbasedpolicy.version>
-    <feature.iotdm.version>0.1.0-SNAPSHOT</feature.iotdm.version>
-    <feature.lacp.version>1.1.0-SNAPSHOT</feature.lacp.version>
-    <feature.lispflowmapping.version>1.3.0-SNAPSHOT</feature.lispflowmapping.version>
-    <feature.mdsal.version>1.3.0-SNAPSHOT</feature.mdsal.version>
-    <feature.messaging4transport.version>1.0.0-SNAPSHOT</feature.messaging4transport.version>
-    <feature.nemo.version>1.0.0-SNAPSHOT</feature.nemo.version>
-    <feature.netconf.version>1.0.0-SNAPSHOT</feature.netconf.version>
-    <feature.netide.version>0.1.0-SNAPSHOT</feature.netide.version>
-    <feature.nic.version>1.1.0-SNAPSHOT</feature.nic.version>
-    <feature.neutron.version>0.6.0-SNAPSHOT</feature.neutron.version>
-    <feature.of-config.version>1.0.0-SNAPSHOT</feature.of-config.version>
-    <feature.openflowplugin.version>0.2.0-SNAPSHOT</feature.openflowplugin.version>
-    <feature.ovsdb.version>1.2.1-SNAPSHOT</feature.ovsdb.version>
-    <feature.packetcable.version>1.3.0-SNAPSHOT</feature.packetcable.version>
-    <feature.reservation.version>1.1.0-SNAPSHOT</feature.reservation.version>
-    <feature.restconf.version>1.3.0-SNAPSHOT</feature.restconf.version>
-    <feature.sfc.version>0.2.0-SNAPSHOT</feature.sfc.version>
-    <feature.snbi.version>1.2.0-SNAPSHOT</feature.snbi.version>
-    <feature.sxp.version>1.2.0-SNAPSHOT</feature.sxp.version>
-    <feature.tcpmd5.version>1.2.0-SNAPSHOT</feature.tcpmd5.version>
-    <feature.topoprocessing.version>0.1.0-SNAPSHOT</feature.topoprocessing.version>
-    <feature.tsdr.version>1.1.0-SNAPSHOT</feature.tsdr.version>
-    <feature.ttp.version>0.2.0-SNAPSHOT</feature.ttp.version>
-    <feature.unimgr.version>0.0.1-SNAPSHOT</feature.unimgr.version>
-    <feature.usc.version>1.1.0-SNAPSHOT</feature.usc.version>
-    <feature.usecplugin.version>1.0.0-SNAPSHOT</feature.usecplugin.version>
-    <feature.vpnservice.version>0.2.0-SNAPSHOT</feature.vpnservice.version>
-    <feature.vtn-manager.version>0.4.0-SNAPSHOT</feature.vtn-manager.version>
-    <feature.yangtools.version>0.8.0-SNAPSHOT</feature.yangtools.version>
-    <junit.version>4.8.1</junit.version>
-    <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <didm.version>0.3.0-SNAPSHOT</didm.version>
+    <feature.aaa.version>0.4.0-SNAPSHOT</feature.aaa.version>
+    <feature.alto.version>0.3.0-SNAPSHOT</feature.alto.version>
+    <!-- Remove Armoury from Beryllium release as per as committers consent:
+    https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
+    Need to be uncommented once in Boron -->
+    <!-- <feature.armoury.version>1.1.0-SNAPSHOT</feature.armoury.version> -->
+    <feature.benchmark.version>1.2.0-SNAPSHOT</feature.benchmark.version>
+    <feature.bgpcep.version>0.6.0-SNAPSHOT</feature.bgpcep.version>
+    <feature.capwap.version>0.3.0-SNAPSHOT</feature.capwap.version>
+    <feature.centinel.version>0.2.0-SNAPSHOT</feature.centinel.version>
+    <feature.circuitsw.version>1.1.0-SNAPSHOT</feature.circuitsw.version>
+    <feature.controller.extras.version>1.7.0-SNAPSHOT</feature.controller.extras.version>
+    <feature.dlux.version>0.4.0-SNAPSHOT</feature.dlux.version>
+    <feature.faas.version>1.1.0-SNAPSHOT</feature.faas.version>
+    <feature.flow.version>1.4.0-SNAPSHOT</feature.flow.version>
+    <feature.groupbasedpolicy.version>0.4.0-SNAPSHOT</feature.groupbasedpolicy.version>
+    <feature.iotdm.version>0.2.0-SNAPSHOT</feature.iotdm.version>
+    <feature.l2switch.version>0.4.0-SNAPSHOT</feature.l2switch.version>
+    <feature.lacp.version>1.2.0-SNAPSHOT</feature.lacp.version>
+    <feature.lispflowmapping.version>1.4.0-SNAPSHOT</feature.lispflowmapping.version>
+    <feature.mdsal.version>1.4.0-SNAPSHOT</feature.mdsal.version>
+    <feature.nemo.version>1.1.0-SNAPSHOT</feature.nemo.version>
+    <feature.netconf.version>1.1.0-SNAPSHOT</feature.netconf.version>
+    <feature.netide.version>0.2.0-SNAPSHOT</feature.netide.version>
+    <feature.netvirt.version>1.3.0-SNAPSHOT</feature.netvirt.version>
+    <feature.nic.version>1.2.0-SNAPSHOT</feature.nic.version>
+    <feature.neutron.version>0.7.0-SNAPSHOT</feature.neutron.version>
+    <feature.odlparent.version>1.7.0-SNAPSHOT</feature.odlparent.version>
+    <feature.of-config.version>1.1.0-SNAPSHOT</feature.of-config.version>
+    <feature.openflowplugin.version>0.3.0-SNAPSHOT</feature.openflowplugin.version>
+    <feature.ovsdb.version>1.3.0-SNAPSHOT</feature.ovsdb.version>
+    <feature.packetcable.version>1.4.0-SNAPSHOT</feature.packetcable.version>
+    <feature.restconf.version>1.4.0-SNAPSHOT</feature.restconf.version>
+    <feature.sdninterfaceapp.version>1.7.0-SNAPSHOT</feature.sdninterfaceapp.version>
+    <feature.sfc.version>0.3.0-SNAPSHOT</feature.sfc.version>
+    <feature.snbi.version>1.3.0-SNAPSHOT</feature.snbi.version>
+    <feature.snmp4sdn.version>0.4.0-SNAPSHOT</feature.snmp4sdn.version>
+    <feature.sxp.version>1.3.0-SNAPSHOT</feature.sxp.version>
+    <feature.tcpmd5.version>1.3.0-SNAPSHOT</feature.tcpmd5.version>
+    <feature.topoprocessing.version>0.2.0-SNAPSHOT</feature.topoprocessing.version>
+    <feature.tsdr.version>1.2.0-SNAPSHOT</feature.tsdr.version>
+    <feature.ttp.version>0.3.0-SNAPSHOT</feature.ttp.version>
+    <feature.unimgr.version>0.1.0-SNAPSHOT</feature.unimgr.version>
+    <feature.usc.version>1.2.0-SNAPSHOT</feature.usc.version>
+    <feature.usecplugin.version>1.1.0-SNAPSHOT</feature.usecplugin.version>
+    <feature.vpnservice.version>0.3.0-SNAPSHOT</feature.vpnservice.version>
+    <feature.vtn-manager.version>0.5.0-SNAPSHOT</feature.vtn-manager.version>
+    <feature.yang-push.version>1.1.0-SNAPSHOT</feature.yang-push.version>
+    <feature.yangtools.version>1.0.0-SNAPSHOT</feature.yangtools.version>
+    <karaf.branding.version>1.3.0-SNAPSHOT</karaf.branding.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <snmp.plugin.version>1.1.0-SNAPSHOT</snmp.plugin.version>
+    <snmp.plugin.version>1.2.0-SNAPSHOT</snmp.plugin.version>
     <!-- Keep this list sorted alphabetically please -->
   </properties>
+
   <modules>
-    <module>distributions/</module>
-    <module>features/</module>
-    <module>feature-selector</module>
+    <module>distribution-karaf</module>
+    <module>features-index</module>
+    <module>features-test</module>
   </modules>
 
-  <distributionManagement>
-    <!-- OpenDayLight Released artifact -->
-    <repository>
-      <id>opendaylight-release</id>
-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <snapshotRepository>
-      <id>opendaylight-snapshot</id>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </snapshotRepository>
-    <site>
-      <id>${project.artifactId}-site</id>
-      <url>./</url>
-    </site>
-  </distributionManagement>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>${maven.surefire.version}</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcer.version}</version>
         <executions>
           <execution>
             <id>enforce-maven</id>