From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 20 Dec 2023 08:21:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.116^0
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=028b97c44bc760076faadbe84ec275a73afc2045;hp=7908f61886b8e6ada11a786c1350c4d766199808;p=lgpl%2Fargeo-commons.git

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 007c16a74..0b9fb57a8 100644
--- a/org.argeo.cms.cli/bnd.bnd
+++ b/org.argeo.cms.cli/bnd.bnd
@@ -1,25 +1,25 @@
 Main-Class: org.argeo.cms.cli.ArgeoCli
 
-# cd ~/dev/git/unstable/output/a2/org.argeo.cms
+# cd ~/dev/git/testing/output/a2/org.argeo.cms
 # ls -1; ls -1 ../log/syslogger/org.argeo.tp/*; ls -1 ../org.argeo.tp/*; ls -1 ../org.argeo.tp.sys/*; ls -1 ../org.argeo.tp.httpd/*; ls -1 ../org.argeo.tp.sshd/*; ls -1 ../crypto/fips/org.argeo.tp.crypto/* ; ls -1 ../osgi/equinox/org.argeo.cms/*; ls -1 ../osgi/equinox/org.argeo.tp.osgi/*;
 
 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.register.2.3.jar \
-org.argeo.api.uuid.2.3.jar \
-org.argeo.cms.2.3.jar \
-org.argeo.cms.cli.2.3.jar \
-org.argeo.cms.ee.2.3.jar \
-org.argeo.cms.jshell.2.3.jar \
-org.argeo.cms.lib.dbus.2.3.jar \
-org.argeo.cms.lib.jetty.2.3.jar \
-org.argeo.cms.lib.json.2.3.jar \
-org.argeo.cms.lib.sshd.2.3.jar \
-org.argeo.cms.ux.2.3.jar \
-org.argeo.init.2.3.jar \
-../log/syslogger/org.argeo.tp/org.argeo.tp.syslogger.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.register.2.1.jar \
+org.argeo.api.uuid.2.1.jar \
+org.argeo.cms.2.1.jar \
+org.argeo.cms.cli.2.1.jar \
+org.argeo.cms.ee.2.1.jar \
+org.argeo.cms.jshell.2.1.jar \
+org.argeo.cms.lib.dbus.2.1.jar \
+org.argeo.cms.lib.jetty.2.1.jar \
+org.argeo.cms.lib.json.2.1.jar \
+org.argeo.cms.lib.sshd.2.1.jar \
+org.argeo.cms.ux.2.1.jar \
+org.argeo.init.2.1.jar \
+../log/syslogger/org.argeo.tp/org.argeo.tp.syslogger.2.1.jar \
 ../org.argeo.tp/org.apache.commons.cli.1.6.jar \
 ../org.argeo.tp/org.apache.commons.io.2.15.jar \
 ../org.argeo.tp/org.apache.xerces.2.12.jar \
@@ -107,7 +107,7 @@ org.argeo.init.2.3.jar \
 ../crypto/fips/org.argeo.tp.crypto/bcpkix-fips.1.0.src.jar \
 ../crypto/fips/org.argeo.tp.crypto/bctls-fips.1.0.jar \
 ../crypto/fips/org.argeo.tp.crypto/bctls-fips.1.0.src.jar \
-../osgi/equinox/org.argeo.cms/org.argeo.cms.lib.equinox.2.3.jar \
+../osgi/equinox/org.argeo.cms/org.argeo.cms.lib.equinox.2.1.jar \
 ../osgi/equinox/org.argeo.tp.osgi/org.apache.felix.gogo.command.1.1.jar \
 ../osgi/equinox/org.argeo.tp.osgi/org.apache.felix.gogo.runtime.1.1.jar \
 ../osgi/equinox/org.argeo.tp.osgi/org.apache.felix.gogo.shell.1.1.jar \
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 08bc9ba66..cabcc3462 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 08bc9ba6656515e235eb269c31bc2b1e93748055
+Subproject commit cabcc3462226b71849ca42301c21e05b63f150c2
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 000000000..07beb3676
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,13 @@
+major=2
+minor=1
+micro=116
+qualifier=
+
+Bundle-Copyright= \
+Copyright 2007-2023 Mathieu Baudier, \
+Copyright 2012-2023 Argeo GmbH
+
+SPDX-License-Identifier= \
+LGPL-2.1-or-later \
+OR EPL-2.0 \
+OR LicenseRef-argeo2-GPL-2.0-or-later-with-EPL-and-Apache-and-JCR-permissions
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