From: mbaudier <mbaudier@europe>
Date: Wed, 11 Jul 2018 19:08:41 +0000 (+0200)
Subject: Use repo.argeo.org. Improve build and javadoc generation.
X-Git-Tag: argeo-suite-2.1.13~6
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=34ae5cdfce29c622b9a3618c0c6b2a3cdc5c7cdc

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 b7747d9..8765381 100644
--- 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 6de0f30..9e0a8b3 100644
--- 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 dbdf404..0aaafbc 100644
--- 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 870ef86..9d5aeef 100644
--- 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>