Merge remote-tracking branch 'origin/unstable' into testing

[gpl/argeo-suite.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d005abba1208f32d78517ca203d9af7e3a814a25..6a5c822d474af8930d74d5568e332c6d80a9ae8b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,32 +3,43 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <version>2.1.7</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.1.22-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
+               <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.101</version.argeo-commons>
-               <version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
-
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</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>
-               <module>core</module>
+               <!-- Entity Framework -->
+               <module>org.argeo.entity.api</module>
+               <module>org.argeo.entity.core</module>
+               <module>org.argeo.entity.ui</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>people</module>
-               <module>library</module>
-               <module>environment</module>
-               <module>publishing</module>
-               <module>knowledge</module>
+               <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>
@@ -39,7 +50,7 @@
                <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>
                <developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
-               <tag>v2.x</tag>
+               <tag>HEAD</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>