From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 20 Dec 2023 08:01:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.32~4
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=32e6fcd7f2607415b3e6be7295756bb0b645ca7a;hp=b86dafeed17753a7f10e066a52a00e42043ef187;p=gpl%2Fargeo-suite.git

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

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/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 08bc9ba..cabcc34 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 08bc9ba6656515e235eb269c31bc2b1e93748055
+Subproject commit cabcc3462226b71849ca42301c21e05b63f150c2
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 0000000..5d8d4f4
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,12 @@
+major=2
+minor=1
+micro=30
+qualifier=.next
+
+Bundle-Copyright= \
+Copyright 2014-2023 Argeo GmbH, \
+Copyright 2017-2023 Mathieu Baudier
+
+SPDX-License-Identifier= \
+GPL-2.0-or-later \
+OR LicenseRef-argeo2-GPL-2.0-or-later-with-EPL-and-Apache-and-JCR-permissions