Revert "Fix distribution"

[integration/distribution.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index cdc18dd547b5aca7799d81a72ae0e34aabfbe6cb..1d7e87f8c6132dd20bf2c318becd7eaffe1ca679 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,10 @@
     <!-- 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>
+    <!-- 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.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.capwap.version>0.2.0-SNAPSHOT</feature.capwap.version>
@@ -51,6 +54,7 @@
     <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.snmp4sdn.version>0.3.0-SNAPSHOT</feature.snmp4sdn.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>
@@ -63,31 +67,22 @@
     <feature.vtn-manager.version>0.4.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.yangtools.version>0.8.0-SNAPSHOT</feature.yangtools.version>
     <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <snmp.plugin.version>1.1.0-SNAPSHOT</snmp.plugin.version>
     <!-- Keep this list sorted alphabetically please -->
   </properties>
+
   <modules>
-    <module>distributions/</module>
-    <module>features/</module>
+    <module>distribution-karaf</module>
+    <module>features-index</module>
+    <module>features-test</module>
   </modules>
 
   <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>