X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=9ddce5778d7ffa5b6c3ebcd58036a975aa9c1504;hb=75c484d83489bb183af2cd61a02d4a82412efdf2;hp=a0e081e02b2165653c26a3288670ee2e6f552229;hpb=d86cd691d7818ac31bd3943a31b22ac55d6b0e31;p=yangtools.git

diff --git a/pom.xml b/pom.xml
index a0e081e02b..9ddce5778d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,14 +13,13 @@
     <parent>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yangtools-parent</artifactId>
-      <version>0.6.2-SNAPSHOT</version>
+      <version>0.8.4-SNAPSHOT</version>
       <relativePath>common/parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yangtools-aggregator</artifactId>
-    <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.6.2-SNAPSHOT</version>
+    <name>yangtools</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
     <scm>
@@ -31,14 +30,10 @@
     </scm>
 
     <modules>
-        <module>code-generator</module>
         <module>common</module>
-        <module>integration-test</module>
-        <module>model</module>
-        <module>restconf</module>
-        <module>websocket</module>
         <module>yang</module>
-      <!-- module>third-party</module -->
+        <module>websocket</module>
+        <module>yang-validation-tool</module>
     </modules>
 
     <profiles>
@@ -51,15 +46,61 @@
           <module>benchmarks</module>
         </modules>
       </profile>
+
+      <!-- Turn off doclint on aggregated API javadoc build -->
+      <profile>
+        <id>jdk8</id>
+        <activation>
+          <jdk>[1.8,)</jdk>
+        </activation>
+        <properties>
+          <javadoc.args>-Xdoclint:none</javadoc.args>
+        </properties>
+      </profile>
+
+      <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>
+                  <configuration>
+                    <!-- ignore javadoc warnings caused by JDK8 -->
+                    <additionalparam>${javadoc.args}</additionalparam>
+                  </configuration>
+              </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
     </profiles>
 
     <build>
-        <pluginManagement>        
+        <pluginManagement>
             <plugins>
                 <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
-                 <version>2.12</version>
                  <configuration>
                    <failOnViolation>false</failOnViolation>
                    <configLocation>checkstyle-logging.xml</configLocation>
@@ -84,7 +125,23 @@
                    </execution>
                  </executions>
                </plugin>
-            </plugins>            
+            </plugins>
         </pluginManagement>
     </build>
+
+  <!--
+      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>