X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=90fa2b4fa37bddca0631b3970d64d24f96bfc6bb;hb=7317c5c172fe411eaaf26ff6bc9012b3f36a3c01;hp=fc0b355aeed09b02eef2a01097f5719ebab762d5;hpb=a7cfcce35d1a2d91aa478794381e1c8d37a137de;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index fc0b355ae..90fa2b4fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,22 +5,21 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.74-SNAPSHOT</version>
+		<version>2.1.85-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>2.1.14-SNAPSHOT</version>
+	<version>2.1.17-SNAPSHOT</version>
 	<properties>
+		<version.slc>2.1.17-SNAPSHOT</version.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-		<version.slc>2.1.14-SNAPSHOT</version.slc>
 		<developmentCycle.slc>2.1</developmentCycle.slc>
 
-		<!-- <version.argeo-rcp>2.1.17-SNAPSHOT</version.argeo-rcp> -->
-		<!-- <version.equinox>3.12.50.v20170928-1321</version.equinox> -->
-		<!-- Embedded Maven -->
-		<!-- <version.maven>3.2.5</version.maven> -->
+		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+
+		<version.argeo-commons-legacy>2.1.85-SNAPSHOT</version.argeo-commons-legacy>
 	</properties>
 	<modules>
 		<!-- Runtime -->
@@ -28,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>
@@ -41,16 +39,21 @@
 		<!-- E4 -->
 		<module>org.argeo.slc.e4</module>
 
-		<!-- UI -->
+		<!-- 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>ide</module> -->
 		<module>dist</module>
 		<module>demo</module>
+		<module>ide</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
 	<scm>
@@ -68,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.
@@ -109,23 +112,17 @@ limitations under the License.
 			</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>
@@ -136,27 +133,15 @@ limitations under the License.
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
-<!-- 		<repository> -->
-<!-- 			<id>argeo-rcp</id> -->
-<!-- 			<url>http://repo.argeo.org/data/java/argeo-rcp-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> -->
+		<repository>
+			<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>
 	</repositories>
 	<reporting>
 		<plugins>
@@ -202,7 +187,7 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>javadoc</id>
-						<reports></reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
@@ -219,45 +204,32 @@ limitations under the License.
 					</reportSet>
 					<reportSet>
 						<id>jxr</id>
-						<reports></reports>
+						<reports />
 					</reportSet>
 				</reportSets>
 			</plugin>
 		</plugins>
 	</reporting>
-<!-- 	<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-commons</id> -->
-<!-- 					<url>http://localhost:7070/data/java/argeo-${developmentCycle.argeo-commons}</url> -->
-<!-- 					<releases> -->
-<!-- 						<enabled>true</enabled> -->
-<!-- 						<updatePolicy>daily</updatePolicy> -->
-<!-- 						<checksumPolicy>warn</checksumPolicy> -->
-<!-- 					</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> -->
+	<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-extras</id>
+					<url>http://localhost:7080/data/java/argeo-extras-2.1</url>
+					<releases>
+						<enabled>true</enabled>
+						<updatePolicy>daily</updatePolicy>
+						<checksumPolicy>warn</checksumPolicy>
+					</releases>
+				</repository>
+			</repositories>
+		</profile>
+	</profiles>
 </project>