X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=pom.xml;h=6a5c822d474af8930d74d5568e332c6d80a9ae8b;hp=f8c6c7f6dbc463e4c8bbd0ad3dba15c9ece52894;hb=c285180bece610b2c2921d44fe14b6dde2123efa;hpb=08ee4fc46c97057b28e7e3471f0dddec7c1e2f83

diff --git a/pom.xml b/pom.xml
index f8c6c7f..6a5c822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,38 +3,45 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.7</version>
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
-	<packaging>pom</packaging>
+	<version>2.1-SNAPSHOT</version>
 	<name>Argeo Suite</name>
-	<description />
-	<version>2.1.16-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<url>http://www.argeo.org/</url>
 	<properties>
-		<version.argeo-suite>2.1.16-SNAPSHOT</version.argeo-suite>
+		<version.context>testing</version.context>
 		<!-- Dependencies -->
 		<version.argeo-tp>2.1.27</version.argeo-tp>
-		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-		<version.argeo-commons>2.1.89-SNAPSHOT</version.argeo-commons>
-		<version.argeo-connect>2.1.82-SNAPSHOT</version.argeo-connect>
-		<version.argeo-slc>2.1.17-SNAPSHOT</version.argeo-slc>
-
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
+		<version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
+		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
+		<!-- <version.argeo-rcp>2.1-SNAPSHOT</version.argeo-rcp> -->
 		<git.rw />
 	</properties>
 	<modules>
-		<!-- 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>
+		<!-- Entity Framework -->
+		<module>org.argeo.entity.api</module>
+		<module>org.argeo.entity.core</module>
+		<module>org.argeo.entity.ui</module>
 
-		<!-- Apps -->
-		<module>library</module>
-		<module>systems</module>
-		<module>org.argeo.suite.tracker</module>
+		<!-- Argeo Suite -->
+		<module>org.argeo.suite.core</module>
+		<module>org.argeo.suite.ui</module>
+		<module>org.argeo.suite.ui.rap</module>
+		<module>org.argeo.suite.theme.default</module>
 
+		<!-- Functional areas -->
+		<module>org.argeo.people.ui</module>
+		<module>org.argeo.library.ui</module>
+		<module>org.argeo.geo.ui</module>
+		<module>org.argeo.publishing.ui</module>
+		<module>org.argeo.support.xforms</module>
+		<module>org.argeo.support.odk</module>
+		<module>org.argeo.support.geonames</module>
+
+		<!-- Packaging -->
 		<module>dep</module>
 		<module>dist</module>
 		<module>lib</module>
@@ -51,7 +58,7 @@
 	<inceptionYear>2014</inceptionYear>
 	<licenses>
 		<license>
-			<name> 	GPL-3.0-or-later</name>
+			<name>GPL-3.0-or-later</name>
 			<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
 			<distribution>repo</distribution>
 		</license>
@@ -95,33 +102,20 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<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://repo.argeo.org/data/java/argeo-2.1</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-		<repository>
-			<id>argeo-extras</id>
-			<url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
 	<reporting>
@@ -192,6 +186,11 @@
 		</plugins>
 	</reporting>
 	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
+			<uniqueVersion>false</uniqueVersion>
+		</repository>
 		<site>
 			<id>staging</id>
 			<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>