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

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb00393eff6d61e695fefe2acf9ab0577..3a6302180302c3deb3753de09925c488a4fad945 100644 (file)
--- 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
+       url = https://code.argeo.org/git/cc0/argeo-build.git
+       branch = merge-to-testing

diff --git a/.project b/.project
index c006088ca4ce1000df564ce770c2bd05ecc5f734..2bb4833a36927ad044d4e9ec3cbdaa01664c19a5 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo-commons-unstable</name>
+       <name>argeo-commons</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/branch.mk b/branch.mk
index afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0 100644 (file)
--- 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
deleted file mode 160000 (submodule)
index 011962b..0000000
--- a/sdk/argeo-build
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644 (file)
index 0000000..0ca9cd2
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,3 @@
+major=2
+minor=1
+micro=106
\ No newline at end of file

diff --git a/sdk/deploy/argeo-init/usr/share/argeo/jvm.args b/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
index 878ca90dbb84a8f7638b1308776e71da02b89588..105f76962e77eeb53c8bd3d5b1cc93f940c87301 100644 (file)
--- a/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
+++ b/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
@@ -1 +1 @@
--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
\ No newline at end of file
+-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
\ No newline at end of file