From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Nov 2021 06:41:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.104~4
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=f7a2e63cf5356cfbf5ccc984d181b97ce31a4656;hp=-c;p=lgpl%2Fargeo-commons.git

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

f7a2e63cf5356cfbf5ccc984d181b97ce31a4656
diff --combined cnf/testing.bnd
index d638826d0,000000000..0a43c20de
mode 100644,000000..100644
--- a/cnf/testing.bnd
+++ b/cnf/testing.bnd
@@@ -1,6 -1,0 +1,8 @@@
- category=org.argeo.commons
 +version.released=2.1.103
++qualifier=.next
++
++category=org.argeo.commons
 +Bundle-RequiredExecutionEnvironment=JavaSE-11
 +
 +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
 +argeo.rpm.suffix=
diff --combined dep/org.argeo.dep.cms.client/pom.xml
index d7354d9ad,423b9b32c..d1eca2f86
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dep</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -15,17 -15,17 +15,17 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.enterprise</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.jcr</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.core</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- Third Parties -->
@@@ -234,7 -234,7 +234,7 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.osgi.boot</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  			<scope>test</scope>
  		</dependency>
  	</dependencies>
@@@ -273,8 -273,6 +273,6 @@@
  								</goals>
  								<configuration>
  									<name>argeo-cms-client${argeo.rpm.suffix}</name>
- 									<projversion>${version.released}</projversion>
- 									<release>${maven.build.timestamp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
@@@ -337,7 -335,7 +335,7 @@@
  								<configuration>
  									<name>argeo-cms-client-tp${argeo.rpm.suffix}</name>
  									<projversion>${version.argeo-tp}</projversion>
- 									<release>${maven.build.timestamp}</release>
+ 									<release>${argeo.rpm.release.tp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
diff --combined dep/org.argeo.dep.cms.e4.rap/pom.xml
index df05ac93a,7cdd09255..23e185216
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dep</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -15,7 -15,7 +15,7 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.dep.cms.ui.rap</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  			<type>pom</type>
  		</dependency>
  
@@@ -23,12 -23,12 +23,12 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.cms.e4</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.cms.e4.rap</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- SVG and CSS -->
@@@ -297,8 -297,6 +297,6 @@@
  								</goals>
  								<configuration>
  									<name>argeo-cms-e4-rap${argeo.rpm.suffix}</name>
- 									<projversion>${version.released}</projversion>
- 									<release>${maven.build.timestamp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
@@@ -361,7 -359,7 +359,7 @@@
  								<configuration>
  									<name>argeo-cms-e4-rap-tp${argeo.rpm.suffix}</name>
  									<projversion>${version.argeo-tp}</projversion>
- 									<release>${maven.build.timestamp}</release>
+ 									<release>${argeo.rpm.release.tp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
diff --combined dep/org.argeo.dep.cms.ext/pom.xml
index 3749a9f8e,af26bb8c7..904349332
--- a/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@@ -1,11 -1,9 +1,9 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
- <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.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dep</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -114,7 -112,7 +112,7 @@@
  								<configuration>
  									<name>argeo-cms-ext-tp${argeo.rpm.suffix}</name>
  									<projversion>${version.argeo-tp}</projversion>
- 									<release>${maven.build.timestamp}</release>
+ 									<release>${argeo.rpm.release.tp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
diff --combined dep/org.argeo.dep.cms.node/pom.xml
index 656da2955,f88a1ded9..8dc2dd55a
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dep</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -15,7 -15,7 +15,7 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.dep.cms.client</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  			<type>pom</type>
  		</dependency>
  
@@@ -23,17 -23,17 +23,17 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.api</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.cms</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.maintenance</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- CMS Dependencies -->
@@@ -241,8 -241,6 +241,6 @@@
  								</goals>
  								<configuration>
  									<name>argeo-cms-node${argeo.rpm.suffix}</name>
- 									<projversion>${version.released}</projversion>
- 									<release>${maven.build.timestamp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
@@@ -303,9 -301,9 +301,9 @@@
  									<goal>rpm</goal>
  								</goals>
  								<configuration>
- 									<name>argeo-cms-node-tp</name>
+ 									<name>argeo-cms-node-tp${argeo.rpm.suffix}</name>
  									<projversion>${version.argeo-tp}</projversion>
- 									<release>${maven.build.timestamp}</release>
+ 									<release>${argeo.rpm.release.tp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
diff --combined dep/org.argeo.dep.cms.ui.rap/pom.xml
index b00284f4f,bf645715d..93ab967ec
--- a/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dep</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -15,7 -15,7 +15,7 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.dep.cms.node</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  			<type>pom</type>
  		</dependency>
  
@@@ -49,27 -49,27 +49,27 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.eclipse.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.cms.ui</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.cms.ui.rap</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.cms.ui.theme</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  
  		<!-- SDK -->
@@@ -121,8 -121,6 +121,6 @@@
  								</goals>
  								<configuration>
  									<name>argeo-cms-ui-rap${argeo.rpm.suffix}</name>
- 									<projversion>${version.released}</projversion>
- 									<release>${maven.build.timestamp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
@@@ -141,8 -139,8 +139,8 @@@
  										</mapping>
  									</mappings>
  									<requires>
- 										<require>argeo-cms-node</require>
- 										<require>argeo-cms-ui-rap-tp</require>
+ 										<require>argeo-cms-node${argeo.rpm.suffix}</require>
+ 										<require>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</require>
  									</requires>
  								</configuration>
  							</execution>
@@@ -185,7 -183,7 +183,7 @@@
  								<configuration>
  									<name>argeo-cms-ui-rap-tp${argeo.rpm.suffix}</name>
  									<projversion>${version.argeo-tp}</projversion>
- 									<release>${maven.build.timestamp}</release>
+ 									<release>${argeo.rpm.release.tp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi</directory>
diff --combined dep/pom.xml
index 7c3b04cb6,028b83b65..b83b2886b
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@@ -1,12 -1,10 +1,10 @@@
  <?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">
+ <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.commons</groupId>
  		<artifactId>argeo-commons</artifactId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>dep</artifactId>
@@@ -120,7 -118,7 +118,7 @@@
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.osgi.boot</artifactId>
 -					<version>2.3-SNAPSHOT</version>
 +					<version>2.1-SNAPSHOT</version>
  					<scope>test</scope>
  				</dependency>
  			</dependencies>
diff --combined dist/argeo-cli/pom.xml
index 4d2aa70c0,73c11bf92..d04ba5696
--- a/dist/argeo-cli/pom.xml
+++ b/dist/argeo-cli/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dist</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -16,12 -16,12 +16,12 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.dep.cms.client</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.dep.cms.node</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  	</dependencies>
  	<profiles>
@@@ -33,7 -33,7 +33,7 @@@
  						<groupId>org.apache.maven.plugins</groupId>
  						<artifactId>maven-assembly-plugin</artifactId>
  						<configuration>
- 							<finalName>argeo-cli-${project.version}</finalName>
+ 							<finalName>argeo-cli-${version.released}</finalName>
  							<appendAssemblyId>false</appendAssemblyId>
  							<descriptors>
  								<descriptor>assembly/argeo-cli.xml</descriptor>
@@@ -68,8 -68,6 +68,6 @@@
  								</goals>
  								<configuration>
  									<name>argeo-cli${argeo.rpm.suffix}</name>
- 									<projversion>${version.released}</projversion>
- 									<release>${maven.build.timestamp}</release>
  									<mappings>
  										<mapping>
  											<directory>/etc/argeo-cli</directory>
diff --combined dist/argeo-node/pom.xml
index 10be1edb5,c066a6481..9a6d616b4
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dist</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -16,23 -16,23 +16,23 @@@
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.dep.cms.client</artifactId>
 -					<version>2.3-SNAPSHOT</version>
 +					<version>2.1-SNAPSHOT</version>
  				</dependency>
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.dep.cms.node</artifactId>
 -					<version>2.3-SNAPSHOT</version>
 +					<version>2.1-SNAPSHOT</version>
  				</dependency>
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>org.argeo.dep.cms.e4.rap</artifactId>
 -					<version>2.3-SNAPSHOT</version>
 +					<version>2.1-SNAPSHOT</version>
  				</dependency>
  				<dependency>
  					<groupId>org.argeo.commons</groupId>
  					<artifactId>osgi-boot</artifactId>
  					<type>zip</type>
 -					<version>2.3-SNAPSHOT</version>
 +					<version>2.1-SNAPSHOT</version>
  				</dependency>
  			</dependencies>
  			<build>
@@@ -41,7 -41,7 +41,7 @@@
  						<groupId>org.apache.maven.plugins</groupId>
  						<artifactId>maven-assembly-plugin</artifactId>
  						<configuration>
- 							<finalName>argeo-node-${version.released}${buildId}</finalName>
+ 							<finalName>argeo-node-${version.released}</finalName>
  							<appendAssemblyId>false</appendAssemblyId>
  							<descriptors>
  								<descriptor>assembly/cms-e4-rap.xml</descriptor>
@@@ -76,8 -76,6 +76,6 @@@
  								</goals>
  								<configuration>
  									<name>argeo-node${argeo.rpm.suffix}</name>
- 									<projversion>${version.released}</projversion>
- 									<release>${maven.build.timestamp}</release>
  									<mappings>
  										<mapping>
  											<directory>/etc/argeo</directory>
diff --combined dist/osgi-boot/pom.xml
index 239f3688c,021710088..575b4b4f8
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@@ -2,7 -2,7 +2,7 @@@
  	<modelVersion>4.0.0</modelVersion>
  	<parent>
  		<groupId>org.argeo.commons</groupId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<artifactId>dist</artifactId>
  		<relativePath>..</relativePath>
  	</parent>
@@@ -23,7 -23,7 +23,7 @@@
  		<dependency>
  			<groupId>org.argeo.commons</groupId>
  			<artifactId>org.argeo.osgi.boot</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  		</dependency>
  	</dependencies>
  	<profiles>
@@@ -35,7 -35,7 +35,7 @@@
  						<groupId>org.apache.maven.plugins</groupId>
  						<artifactId>maven-assembly-plugin</artifactId>
  						<configuration>
- 							<finalName>osgi-boot-${project.version}</finalName>
+ 							<finalName>osgi-boot-${version.released}</finalName>
  							<appendAssemblyId>false</appendAssemblyId>
  							<descriptors>
  								<descriptor>assembly/osgi-boot.xml</descriptor>
@@@ -70,8 -70,6 +70,6 @@@
  								</goals>
  								<configuration>
  									<name>argeo-osgi-boot${argeo.rpm.suffix}</name>
- 									<projversion>${version.released}</projversion>
- 									<release>${maven.build.timestamp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/bin</directory>
@@@ -145,7 -143,7 +143,7 @@@
  								<configuration>
  									<name>argeo-osgi-boot-equinox${argeo.rpm.suffix}</name>
  									<projversion>${version.argeo-tp}</projversion>
- 									<release>${maven.build.timestamp}</release>
+ 									<release>${argeo.rpm.release.tp}</release>
  									<mappings>
  										<mapping>
  											<directory>/usr/share/osgi/boot</directory>
diff --combined dist/pom.xml
index 52ed45d55,7e0e20820..f6b9917e0
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@@ -1,12 -1,10 +1,10 @@@
  <?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">
+ <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.commons</groupId>
  		<artifactId>argeo-commons</artifactId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>dist</artifactId>
@@@ -14,7 -12,7 +12,7 @@@
  	<packaging>pom</packaging>
  	<modules>
  		<module>osgi-boot</module>
- 		<module>argeo-cli</module>
+ 		<!-- <module>argeo-cli</module> -->
  		<module>argeo-node</module>
  		<module>containers</module>
  	</modules>
diff --combined pom.xml
index c063132e1,143a3ea5a..fb1bedf58
--- a/pom.xml
+++ b/pom.xml
@@@ -4,18 -4,17 +4,17 @@@
  	<parent>
  		<groupId>org.argeo.maven</groupId>
  		<artifactId>argeo-osgi-parent</artifactId>
- 		<version>2.1.4</version>
+ 		<version>2.1.6</version>
  	</parent>
  	<groupId>org.argeo.commons</groupId>
  	<artifactId>argeo-commons</artifactId>
 -	<version>2.3-SNAPSHOT</version>
 +	<version>2.1-SNAPSHOT</version>
  	<name>Argeo Commons</name>
  	<packaging>pom</packaging>
  	<url>http://www.argeo.org/</url>
  	<properties>
 -		<version.context>unstable</version.context>
 +		<version.context>testing</version.context>
  		<version.argeo-tp>2.1.27</version.argeo-tp>
- 		<project.scm.id>code.argeo.org</project.scm.id>
  	</properties>
  	<modules>
  		<!-- Base -->
@@@ -46,6 -45,7 +45,7 @@@
  		<connection>scm:git:http://git.argeo.org/lgpl/argeo-commons.git</connection>
  		<url>http://git.argeo.org/?p=lgpl/argeo-commons.git;a=summary</url>
  		<developerConnection>scm:git:https://code.argeo.org/git/lgpl/argeo-commons.git</developerConnection>
+ 		<tag>HEAD</tag>
  	</scm>
  	<organization>
  		<name>Argeo GmbH</name>
@@@ -119,12 -119,12 +119,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-commons/</url>
 +			<url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
  		</site>
  	</distributionManagement>
  	<repositories>
@@@ -140,6 -140,18 +140,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>
  		<!-- Disable Maven default repository -->
  		<repository>
  			<id>central</id>
@@@ -219,27 -231,4 +219,4 @@@
  			</plugin>
  		</plugins>
  	</reporting>
- 	<profiles>
- 		<profile>
- 			<id>localrepo</id>
- 			<repositories>
- 				<repository>
- 					<id>argeo</id>
- 					<url>http://localhost:7080/data/java/argeo-2.1</url>
- 					<releases>
- 						<enabled>true</enabled>
- 						<updatePolicy>daily</updatePolicy>
- 						<checksumPolicy>warn</checksumPolicy>
- 					</releases>
- 				</repository>
- 			</repositories>
- 			<distributionManagement>
- 				<repository>
- 					<id>staging</id>
- 					<url>dav:http://localhost:7080/data/java/argeo-2.1/</url>
- 					<uniqueVersion>false</uniqueVersion>
- 				</repository>
- 			</distributionManagement>
- 		</profile>
- 	</profiles>
  </project>
diff --combined sdk/pom.xml
index 5d0a240fd,54bcb222b..9631f6acd
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@@ -1,12 -1,10 +1,10 @@@
  <?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">
+ <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.commons</groupId>
  		<artifactId>argeo-commons</artifactId>
 -		<version>2.3-SNAPSHOT</version>
 +		<version>2.1-SNAPSHOT</version>
  		<relativePath>..</relativePath>
  	</parent>
  	<artifactId>sdk</artifactId>