From: Mathieu <mbaudier@argeo.org>
Date: Tue, 13 Dec 2022 04:53:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.110~1
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=4e36f6abd646130818f63c3db01e5148663b56b4;hp=81eb40f8a68ee85349f26f3468ee52b9af121732

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

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb..d7283346a 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
+	branch = testing
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/org.argeo.cms.cli/bnd.bnd b/org.argeo.cms.cli/bnd.bnd
index 07d35f219..e65d9b319 100644
--- a/org.argeo.cms.cli/bnd.bnd
+++ b/org.argeo.cms.cli/bnd.bnd
@@ -1,18 +1,18 @@
 Main-Class: org.argeo.cms.cli.ArgeoCli
 
 Class-Path: \
-org.argeo.api.acr.2.3.jar \
-org.argeo.api.cli.2.3.jar \
-org.argeo.api.cms.2.3.jar \
-org.argeo.api.uuid.2.3.jar \
-org.argeo.cms.2.3.jar \
-org.argeo.cms.ee.2.3.jar \
-../osgi/equinox/org.argeo.cms/org.argeo.cms.lib.equinox.2.3.jar \
-org.argeo.cms.lib.jetty.2.3.jar \
-org.argeo.cms.lib.sshd.2.3.jar \
-org.argeo.cms.ux.2.3.jar \
-org.argeo.init.2.3.jar \
-org.argeo.util.2.3.jar \
+org.argeo.api.acr.2.1.jar \
+org.argeo.api.cli.2.1.jar \
+org.argeo.api.cms.2.1.jar \
+org.argeo.api.uuid.2.1.jar \
+org.argeo.cms.2.1.jar \
+org.argeo.cms.ee.2.1.jar \
+../osgi/equinox/org.argeo.cms/org.argeo.cms.lib.equinox.2.1.jar \
+org.argeo.cms.lib.jetty.2.1.jar \
+org.argeo.cms.lib.sshd.2.1.jar \
+org.argeo.cms.ux.2.1.jar \
+org.argeo.init.2.1.jar \
+org.argeo.util.2.1.jar \
 ../org.argeo.tp/com.fasterxml.jackson.core.jackson-annotations.2.13.jar \
 ../org.argeo.tp/com.fasterxml.jackson.core.jackson-core.2.13.jar \
 ../org.argeo.tp/com.fasterxml.jackson.core.jackson-databind.2.13.jar \
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 0499267b5..a1d5c8e4b 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 0499267b5f2b534d852cc8a2d5a7070b21730ed4
+Subproject commit a1d5c8e4bbee31d104fc1151cac4a8e19f5ef1fa
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 000000000..63f57dd8f
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=109
+qualifier=.next
\ No newline at end of file
diff --git a/sdk/deploy/argeo-cms/usr/bin/argeo b/sdk/deploy/argeo-cms/usr/bin/argeo
index 636fd4769..9ba91506a 100755
--- a/sdk/deploy/argeo-cms/usr/bin/argeo
+++ b/sdk/deploy/argeo-cms/usr/bin/argeo
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.cli.2.3.jar "$@"
\ No newline at end of file
+java -Dorg.argeo.api.cli.rootCommand=$0 -jar /usr/share/a2/org.argeo.cms/org.argeo.cms.cli.2.1.jar "$@"
\ 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 2d3190d6f..ca3cd0b10 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.18.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.18.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.1.jar org.argeo.init.Service
\ No newline at end of file