Reorganize features to remove unnecessary poms

[integration/distribution.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 8c9cfd7288fa9aa56e9852a1c4532e9ddcce44a1..4cb96b3298b17c3532ed3508e30d2436de7e4901 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
     <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>
     <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>
@@ -61,50 +62,24 @@
     <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>
     <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>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>