BUG-7813: remove spring from base distribution

[odlparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 02d49740929cc69b41aaea749e6606ef87bed5ea..c70bb16ccf38097ec82f8e35f8bff481a370c317 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,11 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>odlparent-lite</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-aggregator</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
     <name>odlparent</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -31,18 +29,34 @@
     <modules>
         <!-- odlparent tools -->
         <module>checkstyle</module>
+        <module>findbugs</module>
         <module>license</module>
+        <module>bundles-test</module>
+        <module>bundles4-test</module>
+        <module>features-test</module>
+        <module>features4-test</module>
+
+        <!-- Karaf integration -->
+        <module>karaf</module>
+        <module>karaf-plugin</module>
+        <module>karaf4-plugin</module>
 
-        <!-- odlparent core -->
+        <!-- Parent POMs -->
         <module>bundle-parent</module>
         <module>features-parent</module>
-        <module>features-test</module>
-        <module>features-odlparent</module>
-        <module>features-akka</module>
-        <module>odlparent-artifacts</module>
+        <module>single-feature3-parent</module>
+        <module>single-feature-parent</module>
+        <module>feature3-repo-parent</module>
+        <module>feature-repo-parent</module>
         <module>odlparent</module>
         <module>odlparent-lite</module>
-        <module>karaf-plugin</module>
+
+        <!-- Features -->
+        <module>features</module>
+        <module>features4</module>
+
+        <!-- Artifacts -->
+        <module>odlparent-artifacts</module>
     </modules>
 
     <build>
@@ -73,7 +87,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.3</version>
+                        <version>2.10.4</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>