X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=572202b33f9680850fd8b63a6e0b17d17be25ddd;hb=6b7325ff096bd8081d4036169d59674d9332a276;hp=c307750de0ae4a6a76d6a41d40350f361ffe7037;hpb=1fe9ba2cbb1fbc9c7808793374d5d4b42cd26688;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index c307750de..572202b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,25 @@
-<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</version>
+		<version>2.1.86-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.11-SNAPSHOT</version>
+	<version>2.1.17-SNAPSHOT</version>
 	<properties>
-		<developmentCycle.slc>2.1</developmentCycle.slc>
+		<version.slc>2.1.17-SNAPSHOT</version.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-<!-- 		<version.argeo-rcp>2.1.15</version.argeo-rcp> -->
-		<version.slc>2.1.10</version.slc>
-		<version.equinox>3.11.1.v20160708-1632</version.equinox>
-		<!-- Embedded Maven -->
-		<version.maven>3.2.5</version.maven>
+		<developmentCycle.slc>2.1</developmentCycle.slc>
+
+		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+
+		<version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
 	</properties>
 	<modules>
 		<!-- Runtime -->
@@ -25,7 +27,6 @@
 		<module>org.argeo.slc.core</module>
 		<module>org.argeo.slc.unit</module>
 		<module>org.argeo.slc.support</module>
-<!-- 		<module>org.argeo.slc.support.maven</module> -->
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
 		<module>org.argeo.slc.launcher</module>
@@ -35,15 +36,24 @@
 		<module>org.argeo.slc.agent.jcr</module>
 		<module>org.argeo.slc.server.repo</module>
 
-		<!-- UI -->
+		<!-- E4 -->
+		<module>org.argeo.slc.e4</module>
+
+		<!-- Desktop -->
+		<module>rcp</module>
+
+		<!-- Legacy UI -->
+		<module>legacy</module>
 		<module>org.argeo.slc.client.ui</module>
 		<module>org.argeo.slc.client.ui.dist</module>
 		<module>org.argeo.slc.client.rap</module>
 
+		<!-- Distribution -->
 		<module>lib</module>
 		<module>dep</module>
 		<module>dist</module>
 		<module>demo</module>
+		<module>ide</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
@@ -61,7 +71,7 @@
 			<comments><![CDATA[
 SLC (Software Life Cycle) framework
 			   
-Copyright (C) 2007-2012 Argeo GmbH
+Copyright (C) 2007-2018 Argeo GmbH
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -101,38 +111,22 @@ limitations under the License.
 				<role>developer</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>developer</role>
-			</roles>
-		</developer>
 	</developers>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-site-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<skip>false</skip>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<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>
@@ -140,52 +134,95 @@ limitations under the License.
 			</releases>
 		</repository>
 		<repository>
-			<id>argeo-rcp</id>
-			<url>http://forge.argeo.org/data/java/argeo-rcp-2.1</url>
+			<id>argeo-extras</id>
+			<url>http://repo.argeo.org/data/java/argeo-extras-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
-
-		<!-- Disable Maven default repository -->
-		<repository>
-			<id>central</id>
-			<url>http://repo1.maven.org/maven2</url>
-			<releases>
-				<enabled>false</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</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>
+		<site>
+			<id>staging</id>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
+		</site>
+	</distributionManagement>
 	<profiles>
 		<profile>
 			<id>localrepo</id>
 			<repositories>
 				<repository>
-					<id>argeo-tp</id>
-					<url>http://localhost:7070/data/java/argeo-${developmentCycle.argeo-commons}</url>
-					<releases>
-						<enabled>true</enabled>
-						<updatePolicy>daily</updatePolicy>
-						<checksumPolicy>warn</checksumPolicy>
-					</releases>
-				</repository>
-				<!-- <repository> -->
-				<!-- <id>argeo-tp-extras</id> -->
-				<!-- <url>http://localhost:7080/data/java/argeo-tp-extras-2.1</url> -->
-				<!-- <releases> -->
-				<!-- <enabled>true</enabled> -->
-				<!-- <updatePolicy>daily</updatePolicy> -->
-				<!-- <checksumPolicy>warn</checksumPolicy> -->
-				<!-- </releases> -->
-				<!-- </repository> -->
-				<repository>
-					<id>argeo-commons</id>
-					<url>http://localhost:7070/data/java/argeo-${developmentCycle.argeo-commons}</url>
+					<id>argeo-extras</id>
+					<url>http://localhost:7080/data/java/argeo-extras-2.1</url>
 					<releases>
 						<enabled>true</enabled>
 						<updatePolicy>daily</updatePolicy>
@@ -193,16 +230,6 @@ limitations under the License.
 					</releases>
 				</repository>
 			</repositories>
-			<distributionManagement>
-				<repository>
-					<id>staging</id>
-					<url>dav:http://localhost:7070/data/java/argeo-slc-${developmentCycle.slc}</url>
-				</repository>
-				<site>
-					<id>staging</id>
-					<url>dav:http://localhost:7070/data/docs/argeo-slc-${developmentCycle.slc}</url>
-				</site>
-			</distributionManagement>
 		</profile>
 	</profiles>
 </project>