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

diff --cc .gitmodules
index d7283346ae7927fcd3fe8c032c443556a3fd661a,07b10cacb00393eff6d61e695fefe2acf9ab0577..3a6302180302c3deb3753de09925c488a4fad945
--- 1/.gitmodules
--- 2/.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 936a67569f072bfad1eeb935aca211a0e0530e86,afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0
--- 1/branch.mk
--- 2/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 5029b67ae930b82e822407b64d740173fe2d34c0,011962b1bb63d375622dbe79a50c45f16374b0a1..0000000000000000000000000000000000000000
deleted file mode 160000,160000
--- 1/sdk/argeo-build
--- 2/sdk/argeo-build
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- Subproject commit 5029b67ae930b82e822407b64d740173fe2d34c0
 -Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1

diff --cc sdk/branches/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0ca9cd22a8ace59ff42d06d6b3ef7e37d67dc206
new file mode 100644 (file)
--- /dev/null
--- /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 8d57ecb7e1f2b5d96fef41275ae27ee578c20614,878ca90dbb84a8f7638b1308776e71da02b89588..105f76962e77eeb53c8bd3d5b1cc93f940c87301
--- 1/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
--- 2/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