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

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

0314a5ddce003a3cc7a0820d895b6f4e81224daf
diff --cc .gitmodules
index 0000000,07b10ca..3a63021
mode 000000,100644..100644
--- a/.gitmodules
+++ b/.gitmodules
@@@ -1,0 -1,4 +1,4 @@@
+ [submodule "sdk/argeo-build"]
+ 	path = sdk/argeo-build
 -	url = http://git.argeo.org/cc0/argeo-build.git
 -	branch = unstable
++	url = https://code.argeo.org/git/cc0/argeo-build.git
++	branch = merge-to-testing
diff --cc .project
index e6aedf8,73340e7..70b4b55
--- a/.project
+++ b/.project
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
- 	<name>argeo-distribution</name>
 -	<name>argeo-tp-unstable</name>
++	<name>argeo-tp</name>
  	<comment></comment>
  	<projects>
  	</projects>
diff --cc branch.mk
index 0000000,afde0f8..dbecaaa
mode 000000,100644..100644
--- a/branch.mk
+++ b/branch.mk
@@@ -1,0 -1,1 +1,1 @@@
 -BRANCH=unstable
++BRANCH=testing
diff --cc sdk/argeo-build
index 0000000,011962b..639ffc6
mode 000000,160000..160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@@ -1,0 -1,1 +1,1 @@@
 -Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1
++Subproject commit 639ffc61c03f6aebf9cfe5e0f79dd0c4c6aa632a
diff --cc sdk/branches/testing.bnd
index 0000000,0000000..9dfd8b2
new file mode 100644
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,4 @@@
++major=2
++minor=1
++micro=31
++qualifier=.next
diff --cc sdk/output-argeo-tp-backend.target
index 0000000,187a7c2..ccb11ac
mode 000000,100644..100644
--- a/sdk/output-argeo-tp-backend.target
+++ b/sdk/output-argeo-tp-backend.target
@@@ -1,0 -1,13 +1,13 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?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}/../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 type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-minimal.target"/>
++		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
+ 	</locations>
+ </target>
diff --cc sdk/output-argeo-tp-minimal.target
index 0000000,4c6530e..e648937
mode 000000,100644..100644
--- a/sdk/output-argeo-tp-minimal.target
+++ b/sdk/output-argeo-tp-minimal.target
@@@ -1,0 -1,11 +1,11 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-minimal">
+ 	<locations>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+ 	</locations>
+ 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+ </target>
diff --cc sdk/output-argeo-tp-rap.target
index 0000000,d5c7289..7e4d512
mode 000000,100644..100644
--- a/sdk/output-argeo-tp-rap.target
+++ b/sdk/output-argeo-tp-rap.target
@@@ -1,0 -1,8 +1,8 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-rap">
+ 	<locations>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rap/org.argeo.tp.swt.workbench" type="Directory"/>
 -		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-rwt.target"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt.workbench" type="Directory"/>
++		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-rwt.target"/>
+ 	</locations>
+ </target>
diff --cc sdk/output-argeo-tp-rcp.target
index 0000000,8b198bc..b94512f
mode 000000,100644..100644
--- a/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@@ -1,0 -1,8 +1,8 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-rcp">
+ 	<locations>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
 -		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-swt.target"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt.workbench" type="Directory"/>
++		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-swt.target"/>
+ 	</locations>
+ </target>
diff --cc sdk/output-argeo-tp-rwt.target
index 0000000,0b4753f..ee96605
mode 000000,100644..100644
--- a/sdk/output-argeo-tp-rwt.target
+++ b/sdk/output-argeo-tp-rwt.target
@@@ -1,0 -1,8 +1,8 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-rwt">
+ 	<locations>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
 -		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/swt/rap/org.argeo.tp.swt" type="Directory"/>
++		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+ 	</locations>
+ </target>
diff --cc sdk/output-argeo-tp-swt.target
index 0000000,a3ec118..cb459d5
mode 000000,100644..100644
--- a/sdk/output-argeo-tp-swt.target
+++ b/sdk/output-argeo-tp-swt.target
@@@ -1,0 -1,10 +1,10 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <?pde version="3.8"?>
+ <target name="argeo-tp-swt">
+ 	<locations>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
 -		<location path="${project_loc:argeo-tp-unstable}/../output/a2/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
 -		<location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-backend.target"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/swt/rcp/org.argeo.tp.swt" type="Directory"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/lib/linux/x86_64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
++		<location path="${project_loc:argeo-tp}/../output/a2/lib/linux/aarch64/swt/rcp/org.argeo.tp.swt" type="Directory"/>
++		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-backend.target"/>
+ 	</locations>
+ </target>