From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Nov 2021 07:51:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.24~7
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=87a1cd9ab3159c01be43489f817224412daa0d42;hp=-c

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

87a1cd9ab3159c01be43489f817224412daa0d42
diff --combined .project
index c9ab03f,3fcd2fd..ff41893
--- a/.project
+++ b/.project
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
- 	<name>argeo-suite-testing</name>
 -	<name>argeo-suite-unstable</name>
++	<name>argeo-suite</name>
  	<comment></comment>
  	<projects>
  	</projects>
diff --combined cnf/build.bnd
index 0000000,38f5f28..c59a50e
mode 000000,100644..100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@@ -1,0 -1,3 +1,3 @@@
+ -include: \
+ ${workspace}/cnf/argeo.bnd, \
 -${workspace}/cnf/unstable.bnd
++${workspace}/cnf/testing.bnd
diff --combined cnf/maven.bnd
index 0000000,f3a6e83..1b962bc
mode 000000,100644..100644
--- a/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@@ -1,0 -1,3 +1,3 @@@
+ -include: \
+ ../cnf/argeo.bnd, \
 -../cnf/unstable.bnd
++../cnf/testing.bnd
diff --combined cnf/testing.bnd
index 0000000,0000000..b778569
new file mode 100644
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,0 -1,0 +1,8 @@@
++version.released=2.1.23
++qualifier=.next
++
++category=org.argeo.suite
++Bundle-RequiredExecutionEnvironment=JavaSE-11
++
++argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
++argeo.rpm.suffix=
diff --combined dep/org.argeo.suite.dep.e4.rap/pom.xml
index 59dcf98,43ad96f..f4238b8
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>dep</artifactId>
- 		<version>2.1.24-SNAPSHOT</version>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>org.argeo.suite.dep.e4.rap</artifactId>
@@@ -15,7 -15,7 +15,7 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  			<type>pom</type>
  		</dependency>
  
diff --combined dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 119d7a0,b4c4229..17b9ae3
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>dep</artifactId>
- 		<version>2.1.23-SNAPSHOT</version>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>org.argeo.suite.dep.e4.rcp</artifactId>
@@@ -21,60 -21,12 +21,12 @@@
  			<type>pom</type>
  		</dependency>
  
- 		<!-- Jackson JSON processor -->
  		<dependency>
- 			<groupId>org.argeo.tp.jackson</groupId>
- 			<artifactId>com.fasterxml.jackson.core.jackson-core</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.jackson</groupId>
- 			<artifactId>com.fasterxml.jackson.core.jackson-databind</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.jackson</groupId>
- 			<artifactId>com.fasterxml.jackson.core.jackson-annotations</artifactId>
- 		</dependency>
- 
- 		<!-- POI requirements -->
- 		<dependency>
- 			<groupId>org.argeo.tp.apache.commons</groupId>
- 			<artifactId>org.apache.commons.math3</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.apache.commons</groupId>
- 			<artifactId>org.apache.commons.collections4</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.apache</groupId>
- 			<artifactId>org.apache.xml.security</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.apache</groupId>
- 			<artifactId>org.apache.xmlbeans</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.apache</groupId>
- 			<artifactId>org.apache.xalan</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.apache</groupId>
- 			<artifactId>org.apache.xalan.serializer</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.apache</groupId>
- 			<artifactId>org.apache.xml.resolver</artifactId>
- 		</dependency>
- 		<dependency>
- 			<groupId>org.argeo.tp.apache</groupId>
- 			<artifactId>org.apache.xerces</artifactId>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.dep.cms.ext</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 			<type>pom</type>
  		</dependency>
- 
- 		<!-- Argeo TP Extras -->
- <!-- 		<dependency> -->
- <!-- 			<groupId>org.argeo.tp.payment</groupId> -->
- <!-- 			<artifactId>com.stripe</artifactId> -->
- <!-- 		</dependency> -->
- 
  	</dependencies>
  	<profiles>
  		<profile>
@@@ -130,7 -82,7 +82,7 @@@
  									<goal>rpm</goal>
  								</goals>
  								<configuration>
- 									<name>argeo-suite-e4-rcp</name>
+ 									<name>argeo-suite-e4-rcp${argeo.rpm.suffix}</name>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
diff --combined dep/org.argeo.suite.dep.ui.rap/pom.xml
index 22c08d3,f52ecf1..1740dd3
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>dep</artifactId>
- 		<version>2.1.24-SNAPSHOT</version>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@@ -29,17 -29,17 +29,17 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.entity.api</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.entity.core</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.entity.ui</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Suite Icons -->
@@@ -53,67 -53,67 +53,67 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.core</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.ui</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.theme.default</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.ui.rap</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo People -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.people.ui</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Library -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.library.ui</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Environment -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.geo.ui</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Publishing -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.publishing.ui</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Argeo Knowledge -->
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.support.xforms</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.support.odk</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.support.geonames</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- PDFBox -->
@@@ -147,13 -147,6 +147,6 @@@
  			<groupId>org.argeo.tp.apache</groupId>
  			<artifactId>org.apache.poi.scratchpad</artifactId>
  		</dependency>
- 
- 		<!-- Argeo TP Extras -->
- 		<!-- <dependency> -->
- 		<!-- <groupId>org.argeo.tp.payment</groupId> -->
- 		<!-- <artifactId>com.stripe</artifactId> -->
- 		<!-- </dependency> -->
- 
  	</dependencies>
  	<profiles>
  		<profile>
@@@ -188,7 -181,7 +181,7 @@@
  									<goal>rpm</goal>
  								</goals>
  								<configuration>
- 									<name>argeo-suite-ui-rap</name>
+ 									<name>argeo-suite-ui-rap${argeo.rpm.suffix}</name>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
@@@ -207,8 -200,8 +200,8 @@@
  										</mapping>
  									</mappings>
  									<requires>
- 										<require>argeo-cms-ui-rap</require>
- 										<require>argeo-suite-ui-rap-tp</require>
+ 										<require>argeo-cms-ui-rap${argeo.rpm.suffix}</require>
+ 										<require>argeo-suite-ui-rap-tp${argeo.rpm.suffix}</require>
  									</requires>
  								</configuration>
  							</execution>
@@@ -249,9 -242,9 +242,9 @@@
  									<goal>rpm</goal>
  								</goals>
  								<configuration>
- 									<name>argeo-suite-ui-rap-tp</name>
+ 									<name>argeo-suite-ui-rap-tp${argeo.rpm.suffix}</name>
  									<version>${version.argeo-tp}</version>
- 									<release>${maven.build.timestamp}</release>
+ 									<release>${argeo.rpm.release.tp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
@@@ -270,7 -263,7 +263,7 @@@
  										</mapping>
  									</mappings>
  									<requires>
- 										<require>argeo-cms-ext-tp</require>
+ 										<require>argeo-cms-ext-tp${argeo.rpm.suffix}</require>
  									</requires>
  								</configuration>
  							</execution>
diff --combined dep/pom.xml
index 6be1672,5695608..d69eb9b
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>argeo-suite</artifactId>
- 		<version>2.1.24-SNAPSHOT</version>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>dep</artifactId>
@@@ -17,6 -17,16 +17,16 @@@
  	</modules>
  	<build>
  		<plugins>
+ 			<plugin>
+ 				<groupId>org.codehaus.mojo</groupId>
+ 				<artifactId>properties-maven-plugin</artifactId>
+ 				<configuration>
+ 					<quiet>true</quiet>
+ 					<files>
+ 						<file>../../cnf/${version.context}.bnd</file>
+ 					</files>
+ 				</configuration>
+ 			</plugin>
  			<plugin>
  				<groupId>org.apache.felix</groupId>
  				<artifactId>maven-bundle-plugin</artifactId>
diff --combined dist/argeo-suite-standard/pom.xml
index f847892,2f97b48..23c524b
--- a/dist/argeo-suite-standard/pom.xml
+++ b/dist/argeo-suite-standard/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>dist</artifactId>
- 		<version>2.1.24-SNAPSHOT</version>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>argeo-suite-standard</artifactId>
@@@ -25,7 -25,7 +25,7 @@@
  									<goal>rpm</goal>
  								</goals>
  								<configuration>
--									<name>argeo-suite-standard-unstable</name>
++									<name>argeo-suite-standard${argeo.rpm.suffix}</name>
  									<mappings>
  										<mapping>
  											<directory>/etc/argeo.d/suite</directory>
diff --combined dist/pom.xml
index 3ea8f54,90ca6d2..dae809c
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@@ -4,7 -4,7 +4,7 @@@
  	<parent>
  		<groupId>org.argeo.suite</groupId>
  		<artifactId>argeo-suite</artifactId>
- 		<version>2.1.24-SNAPSHOT</version>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>dist</artifactId>
@@@ -13,4 -13,18 +13,18 @@@
  	<modules>
  		<module>argeo-suite-standard</module>
  	</modules>
+ 	<build>
+ 		<plugins>
+ 			<plugin>
+ 				<groupId>org.codehaus.mojo</groupId>
+ 				<artifactId>properties-maven-plugin</artifactId>
+ 				<configuration>
+ 					<quiet>true</quiet>
+ 					<files>
+ 						<file>../../cnf/${version.context}.bnd</file>
+ 					</files>
+ 				</configuration>
+ 			</plugin>
+ 		</plugins>
+ 	</build>
  </project>
diff --combined lib/pom.xml
index 7e15779,e00226e..5611ecf
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@@ -3,22 -3,19 +3,20 @@@
  	<parent>
  		<groupId>org.argeo.maven</groupId>
  		<artifactId>argeo-osgi-parent</artifactId>
 -		<version>2.1.6</version>
 +		<version>2.1.3</version>
  	</parent>
  	<groupId>org.argeo.suite</groupId>
  	<artifactId>argeo-suite-lib</artifactId>
  	<packaging>pom</packaging>
  	<name>Parent POM for Argeo Suite Extensions</name>
  	<description />
- 	<version>2.1.24-SNAPSHOT</version>
 -	<version>2.3-SNAPSHOT</version>
++	<version>2.1-SNAPSHOT</version>
  	<properties>
  		<!-- Dependencies -->
  		<version.argeo-tp>2.1.27</version.argeo-tp>
 -		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 -		<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
 +		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
- 		<version.argeo-commons>2.1.103</version.argeo-commons>
++		<version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 +		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
- 
- 		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
  		<git.rw />
  	</properties>
  	<dependencies>
@@@ -30,7 -27,7 +28,7 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
- 			<version>2.1.24-SNAPSHOT</version>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
  			<scope>provided</scope>
  			<exclusions>
  				<!-- Avoid slf4j implementations lurking in the classpath. -->
@@@ -82,6 -79,18 +80,6 @@@
  			<releases>
  				<enabled>true</enabled>
  				<updatePolicy>daily</updatePolicy>
 -				<checksumPolicy>warn</checksumPolicy>
 -			</releases>
 -			<snapshots>
 -				<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>
diff --combined org.argeo.entity.api/pom.xml
index 0000000,d20f3f6..c98575c
mode 000000,100644..100644
--- a/org.argeo.entity.api/pom.xml
+++ b/org.argeo.entity.api/pom.xml
@@@ -1,0 -1,21 +1,21 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.entity.api</artifactId>
+ 	<name>Entity API</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<!-- Argeo Commons -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.enterprise</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.entity.core/pom.xml
index 0000000,090ce00..a050945
mode 000000,100644..100644
--- a/org.argeo.entity.core/pom.xml
+++ b/org.argeo.entity.core/pom.xml
@@@ -1,0 -1,27 +1,27 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.entity.core</artifactId>
+ 	<name>Entity Reference Implementation</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.entity.api</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Argeo Commons -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.cms</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.entity.ui/pom.xml
index 0000000,10c5918..d53f0d0
mode 000000,100644..100644
--- a/org.argeo.entity.ui/pom.xml
+++ b/org.argeo.entity.ui/pom.xml
@@@ -1,0 -1,43 +1,43 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.entity.ui</artifactId>
+ 	<name>Entity UI</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.entity.core</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Argeo Commons -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.cms.ui</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 
+ 		<!-- Specific -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 
+ 		<!-- Eclipse E4 -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp</groupId>
+ 			<artifactId>argeo-tp-rap-e4</artifactId>
+ 			<version>${version.argeo-tp}</version>
+ 			<type>pom</type>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.geo.ui/pom.xml
index 0000000,cfe3a0e..5677817
mode 000000,100644..100644
--- a/org.argeo.geo.ui/pom.xml
+++ b/org.argeo.geo.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.geo.ui</artifactId>
+ 	<name>Geography UI</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Eclipse E4 -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp</groupId>
+ 			<artifactId>argeo-tp-rap-e4</artifactId>
+ 			<version>${version.argeo-tp}</version>
+ 			<type>pom</type>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 		<!-- Specific -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 
+ 	</dependencies>
+ </project>
diff --combined org.argeo.library.ui/pom.xml
index 0000000,672634a..c7a67a8
mode 000000,100644..100644
--- a/org.argeo.library.ui/pom.xml
+++ b/org.argeo.library.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.library.ui</artifactId>
+ 	<name>Documents UI</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Eclipse E4 -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp</groupId>
+ 			<artifactId>argeo-tp-rap-e4</artifactId>
+ 			<version>${version.argeo-tp}</version>
+ 			<type>pom</type>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 		<!-- Specific -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 
+ 	</dependencies>
+ </project>
diff --combined org.argeo.people.ui/pom.xml
index 0000000,d211fc7..30c8eb8
mode 000000,100644..100644
--- a/org.argeo.people.ui/pom.xml
+++ b/org.argeo.people.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.people.ui</artifactId>
+ 	<name>People UI</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Eclipse E4 -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp</groupId>
+ 			<artifactId>argeo-tp-rap-e4</artifactId>
+ 			<version>${version.argeo-tp}</version>
+ 			<type>pom</type>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 		<!-- Specific -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 
+ 	</dependencies>
+ </project>
diff --combined org.argeo.publishing.ui/pom.xml
index 0000000,f26aeb4..5961833
mode 000000,100644..100644
--- a/org.argeo.publishing.ui/pom.xml
+++ b/org.argeo.publishing.ui/pom.xml
@@@ -1,0 -1,37 +1,37 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.publishing.ui</artifactId>
+ 	<name>Publishing UI</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Eclipse E4 -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp</groupId>
+ 			<artifactId>argeo-tp-rap-e4</artifactId>
+ 			<version>${version.argeo-tp}</version>
+ 			<type>pom</type>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 		<!-- Specific -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 
+ 	</dependencies>
+ </project>
diff --combined org.argeo.suite.core/pom.xml
index 0000000,e7402fc..b075044
mode 000000,100644..100644
--- a/org.argeo.suite.core/pom.xml
+++ b/org.argeo.suite.core/pom.xml
@@@ -1,0 -1,32 +1,32 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.suite.core</artifactId>
+ 	<name>Suite Core</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.entity.core</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Argeo Commons -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.cms</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.maintenance</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.suite.theme.default/pom.xml
index 0000000,f2927dc..be49f36
mode 000000,100644..100644
--- a/org.argeo.suite.theme.default/pom.xml
+++ b/org.argeo.suite.theme.default/pom.xml
@@@ -1,0 -1,15 +1,15 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.suite.theme.default</artifactId>
+ 	<name>Suite Default Theme</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.suite.ui.rap/pom.xml
index 0000000,f1f2d83..837a369
mode 000000,100644..100644
--- a/org.argeo.suite.ui.rap/pom.xml
+++ b/org.argeo.suite.ui.rap/pom.xml
@@@ -1,0 -1,29 +1,29 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.suite.ui.rap</artifactId>
+ 	<name>Suite UI RAP</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Eclipse E4 -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp</groupId>
+ 			<artifactId>argeo-tp-rap-e4</artifactId>
+ 			<version>${version.argeo-tp}</version>
+ 			<type>pom</type>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.suite.ui/pom.xml
index 0000000,b5d1b2a..54b6b6f
mode 000000,100644..100644
--- a/org.argeo.suite.ui/pom.xml
+++ b/org.argeo.suite.ui/pom.xml
@@@ -1,0 -1,47 +1,47 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.suite.ui</artifactId>
+ 	<name>Suite UI</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.core</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.entity.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 
+ 		<!-- Argeo Commons -->
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.eclipse.ui</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 
+ 		<!-- Eclipse E4 -->
+ 		<dependency>
+ 			<groupId>org.argeo.tp</groupId>
+ 			<artifactId>argeo-tp-rap-e4</artifactId>
+ 			<version>${version.argeo-tp}</version>
+ 			<type>pom</type>
+ 			<scope>provided</scope>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.support.geonames/pom.xml
index 0000000,ce70b50..3a1e5f3
mode 000000,100644..100644
--- a/org.argeo.support.geonames/pom.xml
+++ b/org.argeo.support.geonames/pom.xml
@@@ -1,0 -1,20 +1,20 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.support.geonames</artifactId>
+ 	<name>Geonames support</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.commons</groupId>
+ 			<artifactId>org.argeo.cms</artifactId>
+ 			<version>${version.argeo-commons}</version>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.support.odk/pom.xml
index 0000000,2f97176..0379dd4
mode 000000,100644..100644
--- a/org.argeo.support.odk/pom.xml
+++ b/org.argeo.support.odk/pom.xml
@@@ -1,0 -1,25 +1,25 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.support.odk</artifactId>
+ 	<name>ODK support</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.core</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.support.xforms</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined org.argeo.support.xforms/pom.xml
index 0000000,08149b1..9d59314
mode 000000,100644..100644
--- a/org.argeo.support.xforms/pom.xml
+++ b/org.argeo.support.xforms/pom.xml
@@@ -1,0 -1,20 +1,20 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <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.suite</groupId>
+ 		<artifactId>argeo-suite</artifactId>
 -		<version>2.3-SNAPSHOT</version>
++		<version>2.1-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 	<artifactId>org.argeo.support.xforms</artifactId>
+ 	<name>XForms support</name>
+ 	<packaging>jar</packaging>
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>org.argeo.suite</groupId>
+ 			<artifactId>org.argeo.suite.core</artifactId>
 -			<version>2.3-SNAPSHOT</version>
++			<version>2.1-SNAPSHOT</version>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --combined pom.xml
index c982334,5e094f2..b6dd237
--- a/pom.xml
+++ b/pom.xml
@@@ -3,33 -3,43 +3,43 @@@
  	<parent>
  		<groupId>org.argeo.maven</groupId>
  		<artifactId>argeo-osgi-parent</artifactId>
- 		<version>2.1.3</version>
+ 		<version>2.1.6</version>
  	</parent>
  	<groupId>org.argeo.suite</groupId>
  	<artifactId>argeo-suite</artifactId>
- 	<version>2.1.24-SNAPSHOT</version>
 -	<version>2.3-SNAPSHOT</version>
++	<version>2.1-SNAPSHOT</version>
  	<name>Argeo Suite</name>
  	<packaging>pom</packaging>
  	<url>http://www.argeo.org/</url>
  	<properties>
 -		<version.context>unstable</version.context>
++		<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.104-SNAPSHOT</version.argeo-commons>
- 		<!-- <version.argeo-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
 -		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 -		<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
 -		<!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
++		<version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 +		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
- 
- 		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
++		<!-- <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>
@@@ -107,6 -117,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>
@@@ -178,12 -200,12 +188,12 @@@
  	<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>
  			<id>staging</id>
 -			<url>file:///srv/docfactory/argeo-2.3/site/argeo-suite/</url>
 +			<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>
  		</site>
  	</distributionManagement>
  </project>