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

Conflicts:
	cnf/build.bnd
	cnf/maven.bnd
	demo/pom.xml
	dep/org.argeo.dep.cms.client/pom.xml
	dep/org.argeo.dep.cms.e4.rap/pom.xml
	dep/org.argeo.dep.cms.ext/pom.xml
	dep/org.argeo.dep.cms.node/pom.xml
	dep/org.argeo.dep.cms.ui.rap/pom.xml
	dep/pom.xml
	dist/argeo-cli/pom.xml
	dist/argeo-node/pom.xml
	dist/containers/pom.xml
	dist/osgi-boot/pom.xml
	dist/pom.xml
	org.argeo.api/pom.xml
	org.argeo.cms.e4.rap/pom.xml
	org.argeo.cms.e4/pom.xml
	org.argeo.cms.ui.rap/pom.xml
	org.argeo.cms.ui.theme/pom.xml
	org.argeo.cms.ui/pom.xml
	org.argeo.cms/pom.xml
	org.argeo.core/pom.xml
	org.argeo.eclipse.ui.rap/pom.xml
	org.argeo.eclipse.ui/pom.xml
	org.argeo.enterprise/pom.xml
	org.argeo.jcr/pom.xml
	org.argeo.maintenance/pom.xml
	org.argeo.osgi.boot/pom.xml
	pom.xml
	sdk/pom.xml

diff --cc .gitmodules
index 0000000000000000000000000000000000000000,07b10cacb00393eff6d61e695fefe2acf9ab0577..d7283346ae7927fcd3fe8c032c443556a3fd661a
mode 000000,100644..100644
--- /dev/null
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,0 -1,4 +1,4 @@@
 -      branch = unstable
+ [submodule "sdk/argeo-build"]
+       path = sdk/argeo-build
+       url = http://git.argeo.org/cc0/argeo-build.git
++      branch = testing

diff --cc branch.mk
index 0000000000000000000000000000000000000000,a6f848887ccc40bb5bdd3db46d37140d94f544eb..936a67569f072bfad1eeb935aca211a0e0530e86
mode 000000,100644..100644
--- /dev/null
--- 2/branch.mk
+++ b/branch.mk
@@@ -1,0 -1,1 +1,1 @@@
 -include $(SDK_SRC_BASE)/cnf/unstable.bnd
++include $(SDK_SRC_BASE)/cnf/testing.bnd

diff --cc cnf/build.bnd
index c59a50e14ae07b3336ef542075e1c5ca0149efee,f6e8be27226265627e5d7817893fdd08eb4d901e..a464edc1fa01eafdc3a058a9630ed2a1de22b625
--- 1/cnf/build.bnd
--- 2/cnf/build.bnd
+++ b/cnf/build.bnd
@@@ -1,3 -1,3 +1,3 @@@
  -include: \
- ${workspace}/cnf/argeo.bnd, \
- ${workspace}/cnf/testing.bnd
 -${workspace}/cnf/unstable.bnd, \
++${workspace}/cnf/testing.bnd, \
+ ${workspace}/sdk/argeo-build/argeo.bnd, \

diff --cc cnf/testing.bnd
index ed5ee7abe79b2688db10b48f20b717e2846f2547,0000000000000000000000000000000000000000..25289aaa023e94ca6d663f2767726403c0310656
mode 100644,000000..100644
--- 1/cnf/testing.bnd
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,8 -1,0 +1,10 @@@
- version.released=2.1.104
++MAJOR=2
++MINOR=1
++MICRO=104
 +qualifier=.next
 +
 +category=org.argeo.commons
 +Bundle-RequiredExecutionEnvironment=JavaSE-11
 +
 +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
 +argeo.rpm.suffix=