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

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

028b97c44bc760076faadbe84ec275a73afc2045
diff --cc org.argeo.cms.cli/bnd.bnd
index 401cda955,007c16a74..0b9fb57a8
--- a/org.argeo.cms.cli/bnd.bnd
+++ b/org.argeo.cms.cli/bnd.bnd
@@@ -1,52 -1,28 +1,28 @@@
  Main-Class: org.argeo.cms.cli.ArgeoCli
  
- # ls -1; ls -1 ../log/syslogger/org.argeo.tp/*; ls -1 ../org.argeo.tp/*; ls -1 ../crypto/fips/org.argeo.tp.crypto/* ; ls -1 ../osgi/equinox/org.argeo.cms/*; ls -1 ../osgi/equinox/org.argeo.tp.osgi/*;
 -# 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/com.apicatalog.jsonld.1.3.jar \
- ../org.argeo.tp/com.fasterxml.jackson.core.jackson.annotations.2.15.jar \
- ../org.argeo.tp/com.fasterxml.jackson.core.jackson.core.2.15.jar \
- ../org.argeo.tp/com.fasterxml.jackson.core.jackson.databind.2.15.jar \
- ../org.argeo.tp/javax.servlet.4.0.jar \
- ../org.argeo.tp/javax.websocket.1.1.jar \
- ../org.argeo.tp/org.apache.batik.1.17.jar \
- ../org.argeo.tp/org.apache.batik.constants.1.17.jar \
- ../org.argeo.tp/org.apache.batik.css.1.17.jar \
- ../org.argeo.tp/org.apache.batik.i18n.1.17.jar \
- ../org.argeo.tp/org.apache.batik.util.1.17.jar \
- ../org.argeo.tp/org.apache.commons.cli.1.5.jar \
- ../org.argeo.tp/org.apache.commons.codec.1.16.jar \
- ../org.argeo.tp/org.apache.commons.compress.1.24.jar \
- ../org.argeo.tp/org.apache.commons.fileupload.1.5.jar \
- ../org.argeo.tp/org.apache.commons.io.2.14.jar \
- ../org.argeo.tp/org.apache.httpcomponents.httpclient.4.5.jar \
- ../org.argeo.tp/org.apache.httpcomponents.httpcore.4.4.jar \
- ../org.argeo.tp/org.apache.httpcomponents.httpmime.4.5.jar \
- ../org.argeo.tp/org.apache.sshd.2.10.jar \
- ../org.argeo.tp/org.apache.sshd.cli.2.10.jar \
- ../org.argeo.tp/org.apache.sshd.git.2.10.jar \
- ../org.argeo.tp/org.apache.sshd.putty.2.10.jar \
- ../org.argeo.tp/org.apache.sshd.scp.2.10.jar \
- ../org.argeo.tp/org.apache.sshd.sftp.2.10.jar \
- ../org.argeo.tp/org.apache.tomcat.jni.9.0.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 \
- ../org.argeo.tp/org.apache.xmlgraphics.2.9.jar \
  ../org.argeo.tp/org.apache.xml.resolver.1.2.jar \
  ../org.argeo.tp/org.eclipse.parsson.1.1.jar \
  ../org.argeo.tp/org.freeedesktop.dbus.4.3.jar \