Improve Javadoc generation

diff --git a/pom.xml b/pom.xml
index b7baa3d1041e58cf4f006f3f89994e7e9e96e68e..361161015110be2dcc5422ec978ba96042a10f0c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -277,75 +277,96 @@ limitations under the License.
                                        <version>1.1.6</version>
                                </plugin>
                                <!-- Site -->
-
                                <plugin>
-                                       <artifactId>maven-site-plugin</artifactId>
-                                       <version>3.6</version>
+                                       <artifactId>maven-javadoc-plugin</artifactId>
+                                       <version>3.0.0</version>
                                        <configuration>
-                                               <!-- <siteDirectory>doc/site</siteDirectory> -->
-                                               <!-- <generateSitemap>true</generateSitemap> -->
-                                               <!-- <skip>false</skip> -->
-                                               <reportPlugins>
-                                                       <!-- <plugin> -->
-                                                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
-                                                       <!-- <artifactId>maven-project-info-reports-plugin</artifactId> -->
-                                                       <!-- <version>2.8.1</version> -->
-                                                       <!-- <reportSets> -->
-                                                       <!-- <reportSet> -->
-                                                       <!-- <reports> -->
-                                                       <!-- <report>index</report> -->
-                                                       <!-- <report>summary</report> -->
-                                                       <!-- <report>license</report> -->
-                                                       <!-- <report>scm</report> -->
-                                                       <!-- </reports> -->
-                                                       <!-- </reportSet> -->
-                                                       <!-- </reportSets> -->
-                                                       <!-- </plugin> -->
-                                                       <plugin>
-                                                               <artifactId>maven-javadoc-plugin</artifactId>
-                                                               <version>2.10.4</version>
-                                                               <configuration>
-                                                                       <encoding>UTF-8</encoding>
-                                                                       <detectLinks>true</detectLinks>
-                                                                       <sourcepath>src</sourcepath>
-                                                                       <links>
-                                                                               <!-- Java -->
-                                                                               <link>http://docs.oracle.com/javase/8/docs/api</link>
-                                                                               <!-- OSGi -->
-                                                                               <link>http://www.osgi.org/javadoc/r5/core</link>
-                                                                               <link>http://www.osgi.org/javadoc/r5/enterprise</link>
-                                                                               <!-- Spring -->
-                                                                               <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
-                                                                               <!-- JCR -->
-                                                                               <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
-                                                                               <!-- Eclipse -->
-                                                                               <link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
-                                                                       </links>
-                                                               </configuration>
-                                                               <reportSets>
-                                                                       <reportSet>
-                                                                               <id>aggregate</id>
-                                                                               <reports>
-                                                                                       <report>aggregate</report>
-                                                                               </reports>
-                                                                       </reportSet>
-                                                               </reportSets>
-                                                       </plugin>
-                                                       <plugin>
-                                                               <artifactId>maven-jxr-plugin</artifactId>
-                                                               <version>2.5</version>
-                                                               <reportSets>
-                                                                       <reportSet>
-                                                                               <id>aggregate</id>
-                                                                               <reports>
-                                                                                       <report>aggregate</report>
-                                                                               </reports>
-                                                                       </reportSet>
-                                                               </reportSets>
-                                                       </plugin>
-                                               </reportPlugins>
+                                               <encoding>UTF-8</encoding>
+                                               <detectLinks>true</detectLinks>
+                                               <!-- <sourcepath>src</sourcepath> -->
+                                               <links>
+                                                       <!-- Java -->
+                                                       <link>http://docs.oracle.com/javase/8/docs/api</link>
+                                                       <!-- OSGi -->
+                                                       <link>http://www.osgi.org/javadoc/r5/core</link>
+                                                       <link>http://www.osgi.org/javadoc/r5/enterprise</link>
+                                                       <!-- Spring -->
+                                                       <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
+                                                       <!-- JCR -->
+                                                       <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
+                                                       <!-- Eclipse -->
+                                                       <link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
+                                               </links>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-site-plugin</artifactId>
+                                       <version>3.7</version>
+                                       <!-- <configuration> -->
+                                       <!-- <siteDirectory>doc/site</siteDirectory> -->
+                                       <!-- <generateSitemap>true</generateSitemap> -->
+                                       <!-- <skip>false</skip> -->
+                                       <!-- <reportPlugins> -->
+                                       <!-- <plugin> -->
+                                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                                       <!-- <artifactId>maven-project-info-reports-plugin</artifactId> -->
+                                       <!-- <version>2.8.1</version> -->
+                                       <!-- <reportSets> -->
+                                       <!-- <reportSet> -->
+                                       <!-- <reports> -->
+                                       <!-- <report>index</report> -->
+                                       <!-- <report>summary</report> -->
+                                       <!-- <report>license</report> -->
+                                       <!-- <report>scm</report> -->
+                                       <!-- </reports> -->
+                                       <!-- </reportSet> -->
+                                       <!-- </reportSets> -->
+                                       <!-- </plugin> -->
+                                       <!-- <plugin> -->
+                                       <!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+                                       <!-- <version>3.0.0</version> -->
+                                       <!-- <configuration> -->
+                                       <!-- <encoding>UTF-8</encoding> -->
+                                       <!-- <detectLinks>true</detectLinks> -->
+                                       <!-- <sourcepath>src</sourcepath> -->
+                                       <!-- <links> -->
+                                       <!-- Java -->
+                                       <!-- <link>http://docs.oracle.com/javase/8/docs/api</link> -->
+                                       <!-- OSGi -->
+                                       <!-- <link>http://www.osgi.org/javadoc/r5/core</link> -->
+                                       <!-- <link>http://www.osgi.org/javadoc/r5/enterprise</link> -->
+                                       <!-- Spring -->
+                                       <!-- <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link> -->
+                                       <!-- JCR -->
+                                       <!-- <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link> -->
+                                       <!-- Eclipse -->
+                                       <!-- <link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link> -->
+                                       <!-- </links> -->
+                                       <!-- </configuration> -->
+                                       <!-- <reportSets> -->
+                                       <!-- <reportSet> -->
+                                       <!-- <id>aggregate</id> -->
+                                       <!-- <reports> -->
+                                       <!-- <report>aggregate</report> -->
+                                       <!-- </reports> -->
+                                       <!-- </reportSet> -->
+                                       <!-- </reportSets> -->
+                                       <!-- </plugin> -->
+                                       <!-- <plugin> -->
+                                       <!-- <artifactId>maven-jxr-plugin</artifactId> -->
+                                       <!-- <version>2.5</version> -->
+                                       <!-- <reportSets> -->
+                                       <!-- <reportSet> -->
+                                       <!-- <id>aggregate</id> -->
+                                       <!-- <reports> -->
+                                       <!-- <report>aggregate</report> -->
+                                       <!-- </reports> -->
+                                       <!-- </reportSet> -->
+                                       <!-- </reportSets> -->
+                                       <!-- </plugin> -->
+                                       <!-- </reportPlugins> -->
+                                       <!-- </configuration> -->
+                               </plugin>
                        </plugins>
                </pluginManagement>
                <plugins>
@@ -473,6 +494,79 @@ limitations under the License.
                        <url>dav:https://forge.argeo.org/data/docs/argeo-${developmentCycle.argeo-commons}</url>
                </site>
        </distributionManagement>
+       <reporting>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-project-info-reports-plugin</artifactId>
+                               <version>2.9</version>
+                               <reportSets>
+                                       <reportSet>
+                                               <reports>
+                                                       <report>index</report>
+                                                       <report>summary</report>
+                                                       <report>license</report>
+                                                       <report>scm</report>
+                                               </reports>
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-javadoc-plugin</artifactId>
+                               <version>3.0.0</version>
+                               <configuration>
+                                       <encoding>UTF-8</encoding>
+                                       <detectLinks>true</detectLinks>
+                                       <!-- <sourcepath>src</sourcepath> -->
+                                       <links>
+                                               <!-- Java -->
+                                               <link>http://docs.oracle.com/javase/8/docs/api</link>
+                                               <!-- OSGi -->
+                                               <link>http://www.osgi.org/javadoc/r5/core</link>
+                                               <link>http://www.osgi.org/javadoc/r5/enterprise</link>
+                                               <!-- Spring -->
+                                               <link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
+                                               <!-- JCR -->
+                                               <link>http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0</link>
+                                               <!-- Eclipse -->
+                                               <link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
+                                       </links>
+                               </configuration>
+                               <reportSets>
+                                       <reportSet>
+                                               <id>aggregate-javadoc</id>
+                                               <inherited>false</inherited>
+                                               <reports>
+                                                       <report>aggregate</report>
+                                               </reports>
+                                       </reportSet>
+                                       <reportSet>
+                                               <id>javadoc</id>
+                                               <reports>
+                                               </reports>
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-jxr-plugin</artifactId>
+                               <version>2.5</version>
+                               <reportSets>
+                                       <reportSet>
+                                               <id>aggregate-jxr</id>
+                                               <inherited>false</inherited>
+                                               <reports>
+                                                       <report>aggregate</report>
+                                               </reports>
+                                       </reportSet>
+                                       <reportSet>
+                                               <id>jxr</id>
+                                               <reports>
+                                               </reports>
+                                       </reportSet>
+                               </reportSets>
+                       </plugin>
+               </plugins>
+       </reporting>
        <profiles>
                <profile>
                        <id>localrepo</id>