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

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

diff --git a/pom.xml b/pom.xml
index d2872fe731983b3c55bcf16df42b9386bd1cadc3..6a5c822d474af8930d74d5568e332c6d80a9ae8b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,36 +1,45 @@
-<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.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.3.1-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.3.1-SNAPSHOT</version.argeo-commons>
-               <version.argeo-suite-icons>2.1.1-SNAPSHOT</version.argeo-suite-icons>
-
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/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>
@@ -108,18 +117,6 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
-               <repository>
-                       <id>argeo-unstable</id>
-                       <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-               </repository>
        </repositories>
        <reporting>
                <plugins>
@@ -191,7 +188,7 @@
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>