X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=pom.xml;h=b61806e55003057021f0af54907067a55e465505;hp=0fb914f643f94efb00e39a124fa2bd115dc31d88;hb=192ebe5a8b2fc77324ad4ed31693d4facccc9b6a;hpb=9b38e264acb7cd514455ae0b1e2c43df6fb14011

diff --git a/pom.xml b/pom.xml
index 0fb914f..b61806e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,32 +1,43 @@
-<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.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.70-SNAPSHOT</version>
+		<version>2.1.75</version>
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo Suite</name>
 	<description />
-	<version>0.1.12-SNAPSHOT</version>
+	<version>2.1.14-SNAPSHOT</version>
+	<properties>
+		<version.argeo-suite>2.1.14-SNAPSHOT</version.argeo-suite>
+		<version.argeo-connect>2.1.79</version.argeo-connect>
+		<version.argeo-tp-extras>2.1.10</version.argeo-tp-extras>
+		<git.rw />
+	</properties>
 	<modules>
+		<!-- Web -->
 		<module>org.argeo.suite.web</module>
-		<module>org.argeo.suite.workbench.rap</module>
-		<module>org.argeo.suite.theme.argeo2</module>
-		<module>org.argeo.suite.apps</module>
 		<module>org.argeo.suite.apps.web</module>
+
+		<!-- Eclipse 4 -->
+		<module>org.argeo.suite.cms</module>
+		<module>org.argeo.suite.e4</module>
+		<module>org.argeo.suite.e4.rap</module>
+		<module>org.argeo.suite.standard</module>
+		
+		<!-- Apps -->
+		<module>org.argeo.suite.tracker</module>
+
+		<!-- Workbench -->
+		<module>org.argeo.suite.apps</module>
+		<module>org.argeo.suite.workbench.rap</module>
+
 		<module>dep</module>
+		<module>dist</module>
 	</modules>
-	<properties>
-		<version.argeo-suite>0.1.12-SNAPSHOT</version.argeo-suite>
-		<developmentCycle.argeo-suite>0.1</developmentCycle.argeo-suite>
-		<version.argeo-connect>2.1.78-SNAPSHOT</version.argeo-connect>
-		<version.argeo-tp-extras>2.1.9</version.argeo-tp-extras>
-		<git.rw />
-	</properties>
 	<scm>
 		<connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
 		<url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
@@ -80,34 +91,22 @@ which are used as well as that of the covered work.]]>
 				<role>QA</role>
 			</roles>
 		</developer>
-		<developer>
-			<id>bsinou</id>
-			<name>Bruno Sinou</name>
-			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
-			<organization>Argeo</organization>
-			<organizationUrl>http://www.argeo.org</organizationUrl>
-			<roles>
-				<role>architect</role>
-				<role>developer</role>
-				<role>QA</role>
-			</roles>
-		</developer>
 	</developers>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp.extras</groupId>
+				<artifactId>argeo-tp-extras</artifactId>
+				<version>${version.argeo-tp-extras}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<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>
@@ -116,7 +115,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>
@@ -124,11 +123,77 @@ which are used as well as that of the covered work.]]>
 			</releases>
 		</repository>
 	</repositories>
+	<reporting>
+		<plugins>
+			<plugin>
+				<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>
+					<links>
+						<link>http://docs.oracle.com/javase/8/docs/api</link>
+						<link>https://osgi.org/javadoc/r5/core</link>
+						<link>https://osgi.org/javadoc/r5/enterprise</link>
+						<link>https://docs.adobe.com/docs/en/spec/javax.jcr/javadocs/jcr-2.0</link>
+						<link>http://help.eclipse.org/oxygen/topic/org.eclipse.platform.doc.isv/reference/api</link>
+						<link>http://docs.spring.io/spring/docs/3.2.x/javadoc-api</link>
+					</links>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<id>aggregate-javadoc</id>
+						<inherited>false</inherited>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<id>javadoc</id>
+						<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 />
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
 	<distributionManagement>
-		<repository>
+		<site>
 			<id>staging</id>
-			<url>dav:https://forge.argeo.org/data/java/argeo-extras-2.1</url>
-			<uniqueVersion>false</uniqueVersion>
-		</repository>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>
+		</site>
 	</distributionManagement>
 </project>