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

diff --cc cnf/testing.bnd
index cf327df9c55c6be10468811ad0727d58e0c8dbba,0000000000000000000000000000000000000000..03103bbfd2b41788a212edaea973d81a2965f9bd
mode 100644,000000..100644
--- 1/cnf/testing.bnd
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,6 -1,0 +1,8 @@@
- category=org.argeo.slc
 +version.released=2.1.17
++qualifier=.next
++
++category=org.argeo.slc
 +Bundle-RequiredExecutionEnvironment=JavaSE-11
 +
 +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
 +argeo.rpm.suffix=

diff --cc dep/org.argeo.slc.dep.e4.rap/pom.xml
Simple merge

diff --cc dep/org.argeo.slc.dep.minimal/pom.xml
Simple merge

diff --cc legacy/dep/org.argeo.slc.dep.backend/pom.xml
Simple merge

diff --cc legacy/dep/org.argeo.slc.dep.spring/pom.xml
Simple merge

diff --cc legacy/pom.xml
index 682bea9c32e96ff35a9554e399cd9b94b6457a4e,35bfc02d4080522f758fa7a842e2bf077a2aeee0..f761bb6b1a36f06eb40d3791f094a87aa5853385
--- 1/legacy/pom.xml
--- 2/legacy/pom.xml
+++ b/legacy/pom.xml
@@@ -9,12 -9,9 +9,9 @@@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>legacy</artifactId>
 -      <version>2.3-SNAPSHOT</version>
 +      <version>2.1-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>SLC Legacy Argeo Software</name>
-       <properties>
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
-       </properties>
        <modules>
                <!-- Legacy UI -->
                <module>org.argeo.legacy.fake.java8</module>

diff --cc pom.xml
index a52dd661f17af90339f3ccb438cfe25c99a4b209,0917eef5e2bd1b39eb06e70f74e24778175cc113..736f00665779c5734b7b19a5f5847fd5bc9ce1d7
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -144,23 -156,7 +144,7 @@@
        <distributionManagement>
                <site>
                        <id>staging</id>
 -                      <url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
 +                      <url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
                </site>
        </distributionManagement>
-       <profiles>
-               <profile>
-                       <id>localrepo</id>
-                       <repositories>
-                               <repository>
-                                       <id>argeo-extras</id>
-                                       <url>http://localhost:7080/data/java/argeo-extras-2.1</url>
-                                       <releases>
-                                               <enabled>true</enabled>
-                                               <updatePolicy>daily</updatePolicy>
-                                               <checksumPolicy>warn</checksumPolicy>
-                                       </releases>
-                               </repository>
-                       </repositories>
-               </profile>
-       </profiles>
  </project>