From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 19 Oct 2022 09:05:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.32~4
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=6ae30d8f0364ff921d8d50011228ac4247df59e9

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

6ae30d8f0364ff921d8d50011228ac4247df59e9
diff --cc sdk/output-argeo-tp-backend.target
index ccb11ac,68982e5..b78875a
--- a/sdk/output-argeo-tp-backend.target
+++ b/sdk/output-argeo-tp-backend.target
@@@ -2,12 -2,12 +2,12 @@@
  <?pde version="3.8"?>
  <target name="argeo-tp-backend">
  	<locations>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-minimal.target"/>
 +		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 +		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 +		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 +		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 +		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
- 		<location path="${project_loc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 +		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
  	</locations>
  </target>