X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=747bdde8993a0982b756a396ec44d6b8874d35df;hb=0da8cea9fcd1c78753493ed6929f6e3241da06df;hp=bb6765655b3c5f8cd4d1ecb2f4e73292f866e373;hpb=15f9ad578d710e996df66e1795f38849db51d878;p=transportpce.git

diff --git a/pom.xml b/pom.xml
index bb6765655..747bdde89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.9.0</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
@@ -29,22 +29,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </scm>
 
   <modules>
-    <module>api</module>
+    <module>artifacts</module>
     <module>ordmodels</module>
-    <module>impl</module>
+    <module>api</module>
+    <module>common</module>
     <module>renderer</module>
+    <module>inventory</module>
+    <module>networkmodel</module>
     <module>olm</module>
-    <module>stubrenderer</module>
-    <module>stubpce</module>
+    <module>tests</module>
     <module>servicehandler</module>
-    <module>karaf</module>
     <module>features</module>
-    <module>artifacts</module>
-    <module>cli</module>
-    <module>it</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>
@@ -61,56 +71,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
           <skip>true</skip>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <sourcepath>*/target/generated-sources/mdsal-binding/*</sourcepath>
+          <excludePackageNames>*</excludePackageNames>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <!--
-          This profile is to ensure we only build javadocs reports
-          when we plan to deploy Maven site for our project.
-      -->
-      <id>maven-site</id>
-      <activation>
-        <file>
-          <exists>${user.dir}/deploy-site.xml</exists>
-        </file>
-      </activation>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <inherited>false</inherited>
-            <executions>
-              <execution>
-                <id>aggregate</id>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
-                <phase>package</phase>
-            </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>