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

Conflicts:
	cnf/build.bnd
	dep/org.argeo.suite.dep.e4.rap/pom.xml
	dep/org.argeo.suite.dep.e4.rcp/pom.xml
	dep/org.argeo.suite.dep.ui.rap/pom.xml
	dep/pom.xml
	dist/argeo-suite-standard/pom.xml
	dist/pom.xml
	lib/pom.xml
	org.argeo.entity.api/pom.xml
	org.argeo.entity.core/pom.xml
	org.argeo.entity.ui/pom.xml
	org.argeo.geo.ui/pom.xml
	org.argeo.library.ui/pom.xml
	org.argeo.people.ui/pom.xml
	org.argeo.publishing.ui/pom.xml
	org.argeo.suite.core/pom.xml
	org.argeo.suite.theme.default/pom.xml
	org.argeo.suite.ui.rap/pom.xml
	org.argeo.suite.ui/pom.xml
	org.argeo.support.geonames/pom.xml
	org.argeo.support.odk/pom.xml
	org.argeo.support.xforms/pom.xml
	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/argeo.bnd
index d1c001a3fef44ea2693407bbc1516ad5122065bc,22ed0df6b5d08324a720884e2b66bb45c5ba6944..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/cnf/argeo.bnd
--- 2/cnf/argeo.bnd
+++ /dev/null
@@@ -1,13 -1,14 +1,0 @@@
--# Common
--Bundle-Version: ${version.released}${qualifier}
--Private-Package: *.internal.*
--Export-Package: !*.internal.*, *
- -consumer-policy : ${range;[==,=+)}
 -#-consumer-policy : ${range;[==,=+)}
 --contract: !JavaServlet,*
---savemanifest : META-INF/MANIFEST.MF
- -includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
 --includeresource.default : bin,OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
---compression STORE
---source true
---removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
--Automatic-Module-Name: ${bsn}
--SLC-Category=${category}
---groupid=${category}

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/maven.bnd
index 1b962bce97311a102a4164e0a5b5283186d12410,f3a6e83cff694e34f205b57c12ac484b31039798..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/cnf/maven.bnd
--- 2/cnf/maven.bnd
+++ /dev/null
@@@ -1,3 -1,3 +1,0 @@@
---include: \
--../cnf/argeo.bnd, \
- ../cnf/testing.bnd
 -../cnf/unstable.bnd

diff --cc cnf/testing.bnd
index b77856958091fa416fb8890ac944e1c0c8cb298d,0000000000000000000000000000000000000000..32c83b01de31620585e3f6341df2c1c59061613f
mode 100644,000000..100644
--- 1/cnf/testing.bnd
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,8 -1,0 +1,10 @@@
- version.released=2.1.23
++MAJOR=2
++MINOR=1
++MICRO=23
 +qualifier=.next
 +
 +category=org.argeo.suite
 +Bundle-RequiredExecutionEnvironment=JavaSE-11
 +
 +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
 +argeo.rpm.suffix=