From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 12 Mar 2022 12:30:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.26~4
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=73f619d9a87672e9f6434123b2a741bdaf2f27e2

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

Conflicts:
	sdk/output-cms-rap.target
	sdk/output-cms-rcp.target
---

73f619d9a87672e9f6434123b2a741bdaf2f27e2
diff --cc sdk/output-cms-rap.target
index 980d3c2,820cb32..b6f3036
--- a/sdk/output-cms-rap.target
+++ b/sdk/output-cms-rap.target
@@@ -2,14 -2,17 +2,17 @@@
  <?pde version="3.8"?>
  <target name="(output) CMS RAP">
  	<locations>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.eclipse.rap" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms.eclipse.rap" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp" type="Directory"/>
++		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.formats" type="Directory"/>
++		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.poi" type="Directory"/>
++		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.gis" type="Directory"/>
  	</locations>
  </target>
diff --cc sdk/output-cms-rcp.target
index d740753,ce7bc50..9e81871
--- a/sdk/output-cms-rcp.target
+++ b/sdk/output-cms-rcp.target
@@@ -2,14 -2,17 +2,17 @@@
  <?pde version="3.8"?>
  <target name="(output) CMS RCP">
  	<locations>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.eclipse.rcp" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms.eclipse.rcp" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 +		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp" type="Directory"/>
++		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.formats" type="Directory"/>
++		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.poi" type="Directory"/>
++		<location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.gis" type="Directory"/>
  	</locations>
  </target>