Bump project to 2.0.0 and fix feature deployment

[transportpce.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 67eb9b846cfbd387458f61eba3be6b8663d2f53c..211cc5a36af54913baa30c904ec81b47ed364530 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.0</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-aggregator</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>transportpce</name>
   <packaging>pom</packaging>
 
@@ -29,30 +29,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </scm>
 
   <modules>
-    <module>artifacts</module>
     <module>ordmodels</module>
+    <module>tapimodels</module>
     <module>api</module>
     <module>common</module>
+    <module>test-common</module>
     <module>renderer</module>
+    <module>networkmodel</module>
+    <module>inventory</module>
     <module>olm</module>
-    <module>tests</module>
+    <module>pce</module>
     <module>servicehandler</module>
+    <module>tapi</module>
     <module>features</module>
     <module>karaf</module>
   </modules>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <!--
-      Jenkins-releng tests reports more than 600 lines of javadoc warnings on ordmodels
-      and api folders generated-sources for unclear reasons.
-      This behavior was impossible to reproduce locally.
-      The javadoc plugin build section below removes most of those useless warnings.
-      ordmodels/pom.xml and api/pom.xml have been modified similarly with a build and
-      a reporting sections to remove the rest of the warnings.
-      Note that javadoc plugins maven implementation still suffers from several bugs.
-      Tests shows that many configurations options are not correctly supported.
-      (proxy, sourceFilesExclude, etc...).
-  -->
   <build>
     <plugins>
       <plugin>
@@ -79,4 +71,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       </plugin>
     </plugins>
   </build>
+
 </project>