From: Mathieu <mbaudier@argeo.org>
Date: Tue, 6 Dec 2022 05:11:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.1~3
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=40e89f491fb2aad2e1219b28106588ea365198a0;hp=57e96851cc8da52a49fbd2ceae641a1934303e9d;p=gpl%2Fargeo-jcr.git

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

diff --git a/.gitmodules b/.gitmodules
index 06282cd..3a63021 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
+	url = https://code.argeo.org/git/cc0/argeo-build.git
+	branch = merge-to-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 0499267..5bf3887 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 0499267b5f2b534d852cc8a2d5a7070b21730ed4
+Subproject commit 5bf388711048a659992c292c4b9bdcbc595e066b
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 0000000..0bfa237
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=0
+qualifier=.next
\ No newline at end of file