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

Conflicts:
	cms/org.argeo.cms.integration/pom.xml
	cms/org.argeo.ext.equinox.jetty/pom.xml
	cms/pom.xml
	cnf/build.bnd
	dep/org.argeo.slc.dep.e4.rap/pom.xml
	dep/org.argeo.slc.dep.minimal/pom.xml
	dep/pom.xml
	ide/features/pom.xml
	ide/plugins/pom.xml
	ide/pom.xml
	legacy/argeo-commons/pom.xml
	legacy/dep/org.argeo.slc.dep.backend/pom.xml
	legacy/dep/org.argeo.slc.dep.spring/pom.xml
	legacy/dep/pom.xml
	legacy/lib/pom.xml
	legacy/org.argeo.legacy.fake.java8/pom.xml
	legacy/org.argeo.slc.agent.jcr/pom.xml
	legacy/org.argeo.slc.agent/pom.xml
	legacy/org.argeo.slc.client.rap/pom.xml
	legacy/org.argeo.slc.client.ui.dist/pom.xml
	legacy/org.argeo.slc.client.ui/pom.xml
	legacy/org.argeo.slc.demo.ant/pom.xml
	legacy/org.argeo.slc.demo.basic/pom.xml
	legacy/org.argeo.slc.demo.minimal/pom.xml
	legacy/org.argeo.slc.launcher/pom.xml
	legacy/org.argeo.slc.server.repo/pom.xml
	legacy/org.argeo.slc.spring/pom.xml
	legacy/org.argeo.slc.support/pom.xml
	legacy/pom.xml
	org.argeo.slc.api/pom.xml
	org.argeo.slc.factory/pom.xml
	org.argeo.slc.jcr/pom.xml
	org.argeo.slc.repo/pom.xml
	org.argeo.slc.runtime/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 .project
Simple merge

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,db505a1e56fd3d3a973d2a5df70eaa2d4b9f1617..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/
---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 a71e97148b351d0924b28fcdf67c9325384ea991,0000000000000000000000000000000000000000..68a372036bfee993b782e0f59455176c5053423d
mode 100644,000000..100644
--- 1/cnf/testing.bnd
--- /dev/null
+++ b/cnf/testing.bnd
@@@ -1,8 -1,0 +1,10 @@@
- version.released=2.1.18
++MAJOR=2
++MINOR=1
++MICRO=18
 +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 sdk/output-argeo-tp-rap.target
index 0000000000000000000000000000000000000000,d5f313450f5a5e2b0e1c24c1d5613dabcb764c08..552c8a4ef9b6365b924de6b2815258251f373304
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-rap.target
+++ b/sdk/output-argeo-tp-rap.target
@@@ -1,0 -1,13 +1,13 @@@
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="(output) argeo-tp-rap">
+       <locations>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.apache" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp" type="Directory"/>
+       </locations>
+ </target>

diff --cc sdk/output-argeo-tp-rcp.target
index 0000000000000000000000000000000000000000,77466926c581489ff5ee716a9f2a865325dbb2c8..1b88949d2e46d8cc34104ec01cc2fa4add6d2fe1
mode 000000,100644..100644
--- /dev/null
--- 2/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@@ -1,0 -1,13 +1,13 @@@
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="(output) argeo-tp-rcp">
+       <locations>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.apache" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp" type="Directory"/>
+       </locations>
+ </target>