Use repo.argeo.org. Improve build and javadoc generation.

diff --git a/org.argeo.suite.apps/pom.xml b/org.argeo.suite.apps/pom.xml
index b7747d909339c19818ab7e8cfeb228b6d25bf2b1..8765381a16c2db26592d42f3674e87e04dea4759 100644 (file)
--- a/org.argeo.suite.apps/pom.xml
+++ b/org.argeo.suite.apps/pom.xml
@@ -1,5 +1,7 @@
 <?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>
        <parent>
                <groupId>org.argeo.suite</groupId>
@@ -21,5 +23,14 @@
                        <artifactId>org.argeo.suite.web</artifactId>
                        <version>0.1.13-SNAPSHOT</version>
                </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>

diff --git a/org.argeo.suite.web/pom.xml b/org.argeo.suite.web/pom.xml
index 6de0f30cf4da547755fba44117fd33f57a27f454..9e0a8b37b1dcdcb14fa990a2c35216873ff65945 100644 (file)
--- a/org.argeo.suite.web/pom.xml
+++ b/org.argeo.suite.web/pom.xml
@@ -1,5 +1,7 @@
 <?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>
        <parent>
                <groupId>org.argeo.suite</groupId>
@@ -16,5 +18,14 @@
                        <artifactId>org.argeo.people.web</artifactId>
                        <version>${version.argeo-connect}</version>
                </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e4</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>

diff --git a/org.argeo.suite.workbench.rap/pom.xml b/org.argeo.suite.workbench.rap/pom.xml
index dbdf40431fe0192597a2cf74c948cfc8eaca1862..0aaafbc9359feb164b5a3f5176e9f80f9eb342ab 100644 (file)
--- a/org.argeo.suite.workbench.rap/pom.xml
+++ b/org.argeo.suite.workbench.rap/pom.xml
@@ -1,5 +1,7 @@
 <?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>
        <parent>
                <groupId>org.argeo.suite</groupId>
@@ -26,5 +28,14 @@
                        <artifactId>org.argeo.people.workbench.rap</artifactId>
                        <version>${version.argeo-connect}</version>
                </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+
        </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 870ef86e5f4ed0e4b794846cddb464051c5d6c54..9d5aeef8ad7014d48459b31677d93a4cec09f602 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -94,17 +94,17 @@ which are used as well as that of the covered work.]]>
                        </roles>
                </developer>
        </developers>
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.10.4</version>
-                               <configuration>
-                                       <skip>true</skip>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+<!--   <build> -->
+<!--           <plugins> -->
+<!--                   <plugin> -->
+<!--                           <artifactId>maven-javadoc-plugin</artifactId> -->
+<!--                           <version>2.10.4</version> -->
+<!--                           <configuration> -->
+<!--                                   <skip>true</skip> -->
+<!--                           </configuration> -->
+<!--                   </plugin> -->
+<!--           </plugins> -->
+<!--   </build> -->
        <dependencyManagement>
                <dependencies>
                        <dependency>
@@ -116,20 +116,19 @@ which are used as well as that of the covered work.]]>
                        </dependency>
                </dependencies>
        </dependencyManagement>
-       <dependencies>
-               <!-- RAP workbench -->
-               <dependency>
-                       <groupId>org.argeo.tp</groupId>
-                       <artifactId>argeo-tp-rap-e3</artifactId>
-                       <version>${version.argeo-tp}</version>
-                       <type>pom</type>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
+<!--   <dependencies> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp</groupId> -->
+<!--                   <artifactId>argeo-tp-rap-e3</artifactId> -->
+<!--                   <version>${version.argeo-tp}</version> -->
+<!--                   <type>pom</type> -->
+<!--                   <scope>provided</scope> -->
+<!--           </dependency> -->
+<!--   </dependencies> -->
        <repositories>
                <repository>
                        <id>argeo</id>
-                       <url>http://forge.argeo.org/data/java/argeo-2.1</url>
+                       <url>http://repo.argeo.org/data/java/argeo-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -138,7 +137,7 @@ which are used as well as that of the covered work.]]>
                </repository>
                <repository>
                        <id>argeo-extras</id>
-                       <url>http://forge.argeo.org/data/java/argeo-extras-2.1</url>
+                       <url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
@@ -153,4 +152,80 @@ which are used as well as that of the covered work.]]>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
        </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>
+                                       <failOnError>false</failOnError>
+                                       <additionalJOption>-Xdoclint:none</additionalJOption>
+                                       <excludePackageNames>*.internal.*,org.eclipse.*</excludePackageNames>
+                                       <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>
 </project>