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;hp=40c75685511b0e72e00ecf99d4216606e2cbf030

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

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

diff --git a/.gitmodules b/.gitmodules
index 07b10ca..d728334 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
+	branch = testing
diff --git a/.project b/.project
index 3fcd2fd..ff41893 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 a6f8488..936a675 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-include $(SDK_SRC_BASE)/cnf/unstable.bnd
+include $(SDK_SRC_BASE)/cnf/testing.bnd
diff --git a/cnf/build.bnd b/cnf/build.bnd
index f6e8be2..a464edc 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,3 +1,3 @@
 -include: \
-${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/testing.bnd, \
 ${workspace}/sdk/argeo-build/argeo.bnd, \
diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644
index 0000000..ea2797d
--- /dev/null
+++ b/cnf/testing.bnd
@@ -0,0 +1,10 @@
+MAJOR=2
+MINOR=1
+MICRO=24
+qualifier=.next
+
+category=org.argeo.suite
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
+argeo.rpm.suffix=
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 90dfe68..5029b67 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 90dfe68dd0a8f9510939b2a276aed3d79e563bb2
+Subproject commit 5029b67ae930b82e822407b64d740173fe2d34c0
diff --git a/sdk/output-cms-rap.target b/sdk/output-cms-rap.target
index 820cb32..b6f3036 100644
--- a/sdk/output-cms-rap.target
+++ b/sdk/output-cms-rap.target
@@ -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>
\ No newline at end of file
diff --git a/sdk/output-cms-rcp.target b/sdk/output-cms-rcp.target
index ce7bc50..9e81871 100644
--- a/sdk/output-cms-rcp.target
+++ b/sdk/output-cms-rcp.target
@@ -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>
\ No newline at end of file