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/?a=commitdiff_plain;h=d2bca81ff63496bf1d879f4cbcd6a531f598e69c;hp=a7ddb1dc8d3bf576d2536505889651c21afa95ff;p=lgpl%2Fargeo-commons.git

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

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb..3a6302180 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
+	url = https://code.argeo.org/git/cc0/argeo-build.git
+	branch = merge-to-testing
diff --git a/.project b/.project
index c006088ca..2bb4833a3 100644
--- 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 afde0f838..dbecaaa4b 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
deleted file mode 160000
index 011962b1b..000000000
--- 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
index 000000000..0ca9cd22a
--- /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 878ca90db..105f76962 100644
--- 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