From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 19 Oct 2022 07:30:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into merge-to-testing
X-Git-Tag: v2.1.107~2^2~4
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=d2bca81ff63496bf1d879f4cbcd6a531f598e69c

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

d2bca81ff63496bf1d879f4cbcd6a531f598e69c
diff --cc .gitmodules
index d7283346a,07b10cacb..3a6302180
--- a/.gitmodules
+++ b/.gitmodules
@@@ -1,4 -1,4 +1,4 @@@
  [submodule "sdk/argeo-build"]
  	path = sdk/argeo-build
--	url = http://git.argeo.org/cc0/argeo-build.git
- 	branch = testing
 -	branch = unstable
++	url = https://code.argeo.org/git/cc0/argeo-build.git
++	branch = merge-to-testing
diff --cc branch.mk
index 936a67569,afde0f838..dbecaaa4b
--- a/branch.mk
+++ b/branch.mk
@@@ -1,1 -1,1 +1,1 @@@
- include $(SDK_SRC_BASE)/cnf/testing.bnd
 -BRANCH=unstable
++BRANCH=testing
diff --cc sdk/argeo-build
index 5029b67ae,011962b1b..000000000
deleted file mode 160000,160000
--- a/sdk/argeo-build
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Subproject commit 5029b67ae930b82e822407b64d740173fe2d34c0
 -Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1
diff --cc sdk/branches/testing.bnd
index 000000000,000000000..0ca9cd22a
new file mode 100644
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,3 @@@
++major=2
++minor=1
++micro=106
diff --cc sdk/deploy/argeo-init/usr/share/argeo/jvm.args
index 8d57ecb7e,878ca90db..105f76962
--- a/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
+++ b/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
@@@ -1,1 -1,1 +1,1 @@@
- -cp /usr/share/a2/org.argeo.tp.eclipse.equinox/org.eclipse.osgi.3.17.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.1.jar org.argeo.init.Service
 --cp /usr/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.17.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.3.jar org.argeo.init.Service
++-cp /usr/share/a2/osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.17.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.1.jar org.argeo.init.Service