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/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=f7a2e63cf5356cfbf5ccc984d181b97ce31a4656

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

f7a2e63cf5356cfbf5ccc984d181b97ce31a4656
diff --cc 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 --cc pom.xml
index c063132e1,143a3ea5a..fb1bedf58
--- a/pom.xml
+++ b/pom.xml
@@@ -13,9 -13,8 +13,8 @@@
  	<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 -->