From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 19 Oct 2022 07:46:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into merge-to-testing
X-Git-Tag: v2.1.26~1^2~4
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=cc03074c27d48af9e5842272c18f8c418a25d3e6;hp=8af1e3aae325ed67654b3a8daad196caff109627

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

diff --git a/.gitmodules b/.gitmodules
index 07b10ca..3a63021 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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 --git a/.project b/.project
index 77cae22..4106bf4 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>argeo-suite-unstable</name>
+	<name>argeo-suite</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/branch.mk b/branch.mk
index afde0f8..dbecaaa 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 011962b..5029b67 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1
+Subproject commit 5029b67ae930b82e822407b64d740173fe2d34c0
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 0000000..22ef9a8
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=25
+qualifier=.next
\ No newline at end of file
diff --git a/sdk/output-cms-rap.target b/sdk/output-cms-rap.target
index 760b2eb..b6f3036 100644
--- a/sdk/output-cms-rap.target
+++ b/sdk/output-cms-rap.target
@@ -2,18 +2,17 @@
 <?pde version="3.8"?>
 <target name="(output) CMS RAP">
 	<locations>
-		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rwt" 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.cms.eclipse.rap" type="Directory"/>
-		<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.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.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>
\ No newline at end of file
diff --git a/sdk/output-cms-rcp.target b/sdk/output-cms-rcp.target
index 33551c8..9e81871 100644
--- a/sdk/output-cms-rcp.target
+++ b/sdk/output-cms-rcp.target
@@ -2,18 +2,17 @@
 <?pde version="3.8"?>
 <target name="(output) CMS RCP">
 	<locations>
-		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.swt" 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.cms.eclipse.rcp" type="Directory"/>
-		<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.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.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>
\ No newline at end of file