From: Mathieu <mbaudier@argeo.org>
Date: Tue, 21 Feb 2023 10:51:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.2~2
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=fe685c03b2b33607f778ac3704c916c518faa59e;hp=ca98326c3b47b94bd9807691c45a1fd5b0a3039a;p=gpl%2Fargeo-jcr.git

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

diff --git a/.gitmodules b/.gitmodules
index 06282cd..d728334 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "src/argeo-build"]
+[submodule "sdk/argeo-build"]
 	path = sdk/argeo-build
 	url = http://git.argeo.org/cc0/argeo-build.git
-	branch = unstable
+	branch = testing
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 ca2d551..a1d5c8e 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit ca2d551c67515082032aad2405f30a924468089a
+Subproject commit a1d5c8e4bbee31d104fc1151cac4a8e19f5ef1fa
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 0000000..884e70a
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=1
+qualifier=.next
\ No newline at end of file