From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 16 Mar 2024 07:15:42 +0000 (+0100)
Subject: Merge tag 'v2.3.21' into testing
X-Git-Tag: v2.1.6~2
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=7a6ba4e06aa62d10c6aadd32559bc9e550a4aba9;hp=b8d94ccc7493616233210a0886cef7c591ebb8a3;p=gpl%2Fargeo-jcr.git

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