From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 16 Mar 2024 07:05:56 +0000 (+0100)
Subject: Merge tag 'v2.3.28' into testing
X-Git-Tag: v2.1.117~1
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=b95462873703848193e56fcbe997693630db6121;hp=-c;p=lgpl%2Fargeo-commons.git

Merge tag 'v2.3.28' into testing
---

b95462873703848193e56fcbe997693630db6121
diff --combined org.argeo.cms.cli/bnd.bnd
index 0b9fb57a8,4f3d2eb37..2cd18eeaa
--- a/org.argeo.cms.cli/bnd.bnd
+++ b/org.argeo.cms.cli/bnd.bnd
@@@ -1,25 -1,24 +1,24 @@@
  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.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 -106,7 +106,7 @@@
  ../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.1.jar \
+ ../osgi/equinox/org.argeo.cms/org.argeo.cms.lib.equinox.2.3.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 --combined sdk/argeo-build
index cabcc3462,ec9a0b67c..979b11e35
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit cabcc3462226b71849ca42301c21e05b63f150c2
 -Subproject commit ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c
++Subproject commit 979b11e352bda7d783c921a62e8cb5ed950a7564