Improve Javadoc

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 9cf77854ff5eb1d03645a4fc0c292c41cf0030a9..55b6d8ab462e6bd76ae3d9587aa8fa50379ac3b4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
@@ -45,8 +46,8 @@
                <connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
                <url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
                <developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
-         <tag>HEAD</tag>
-  </scm>
+               <tag>HEAD</tag>
+       </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
                <license>
@@ -213,10 +214,10 @@ limitations under the License.
                                                <autoVersionSubmodules>true</autoVersionSubmodules>
                                        </configuration>
                                </plugin>
-                               <plugin>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>2.10.1</version>
-                               </plugin>
+                               <!-- <plugin> -->
+                               <!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+                               <!-- <version>2.10.4</version> -->
+                               <!-- </plugin> -->
                                <!-- Apache -->
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
@@ -274,50 +275,49 @@ limitations under the License.
                                        <version>1.1.6</version>
                                </plugin>
                                <!-- Site -->
+
                                <plugin>
                                        <artifactId>maven-site-plugin</artifactId>
-                                       <version>3.4</version>
+                                       <version>3.6</version>
                                        <configuration>
-                                               <siteDirectory>doc/site</siteDirectory>
-                                               <generateSitemap>true</generateSitemap>
-                                               <skip>true</skip>
+                                               <!-- <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> -->
+                                                       <!-- <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.3</version>
+                                                               <version>2.10.4</version>
                                                                <configuration>
-                                                                       <failOnError>false</failOnError>
                                                                        <encoding>UTF-8</encoding>
-                                                                       <excludePackageNames>*.demo.*:*.internal.*</excludePackageNames>
                                                                        <detectLinks>true</detectLinks>
+                                                                       <sourcepath>src</sourcepath>
                                                                        <links>
                                                                                <!-- Java -->
-                                                                               <link>http://docs.oracle.com/javase/6/docs/api</link>
+                                                                               <link>http://docs.oracle.com/javase/8/docs/api</link>
                                                                                <!-- OSGi -->
-                                                                               <link>http://www.osgi.org/javadoc/r4v42</link>
+                                                                               <link>http://www.osgi.org/javadoc/r5/core</link>
+                                                                               <link>http://www.osgi.org/javadoc/r5/enterprise</link>
                                                                                <!-- Spring -->
-                                                                               <link>http://static.springsource.org/spring/docs/2.5.x/api</link>
-                                                                               <link>http://static.springsource.org/osgi/docs/1.2.x/api</link>
-                                                                               <link>http://static.springsource.org/spring-security/site/docs/2.0.x/apidocs</link>
+                                                                               <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/helios/topic/org.eclipse.platform.doc.isv/reference/api</link>
+                                                                               <link>http://help.eclipse.org/neon/topic/org.eclipse.platform.doc.isv/reference/api</link>
                                                                        </links>
                                                                </configuration>
                                                                <reportSets>
@@ -332,12 +332,6 @@ limitations under the License.
                                                        <plugin>
                                                                <artifactId>maven-jxr-plugin</artifactId>
                                                                <version>2.5</version>
-                                                               <configuration>
-                                                                       <excludes>
-                                                                               <exclude>**/demo/**/*</exclude>
-                                                                               <exclude>**/internal/**/*</exclude>
-                                                                       </excludes>
-                                                               </configuration>
                                                                <reportSets>
                                                                        <reportSet>
                                                                                <id>aggregate</id>
@@ -366,12 +360,12 @@ limitations under the License.
                                        </filesets>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
+                       <!-- <plugin> -->
+                       <!-- <artifactId>maven-javadoc-plugin</artifactId> -->
+                       <!-- <configuration> -->
+                       <!-- <skip>true</skip> -->
+                       <!-- </configuration> -->
+                       <!-- </plugin> -->
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <configuration>
@@ -382,7 +376,7 @@ limitations under the License.
                                <artifactId>maven-site-plugin</artifactId>
                                <inherited>false</inherited>
                                <configuration>
-                                       <skip>false</skip>
+                                       <skip>true</skip>
                                </configuration>
                        </plugin>
                        <plugin>
@@ -465,6 +459,10 @@ limitations under the License.
                        <url>dav:https://forge.argeo.org/data/java/argeo-${developmentCycle.argeo-commons}</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
+               <site>
+                       <id>staging</id>
+                       <url>dav:https://forge.argeo.org/data/docs/argeo-${developmentCycle.argeo-commons}</url>
+               </site>
        </distributionManagement>
        <profiles>
                <profile>
@@ -505,8 +503,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -531,8 +531,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>