From: Mathieu Baudier Date: Thu, 1 Jun 2023 06:59:07 +0000 (+0200) Subject: Merge tag 'v2.3.17' into testing X-Git-Tag: v2.1.112~1 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=7a1298bb4b78713553a37fba483373eeaf738069;p=lgpl%2Fargeo-commons.git Merge tag 'v2.3.17' into testing --- 7a1298bb4b78713553a37fba483373eeaf738069 diff --cc org.argeo.cms.cli/bnd.bnd index e65d9b319,91078a88f..7cf8c1391 --- a/org.argeo.cms.cli/bnd.bnd +++ b/org.argeo.cms.cli/bnd.bnd @@@ -1,23 -1,25 +1,25 @@@ 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/*; + 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.lib.dbus.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 \ -../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 \ - ../osgi/equinox/org.argeo.cms/org.argeo.cms.lib.equinox.2.1.jar \ ++org.argeo.cms.lib.dbus.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 \ - ../org.argeo.tp/com.googlecode.javaewah.JavaEWAH.1.1.jar \ - ../org.argeo.tp/de.thjom.java.systemd.2.1.jar \ ++../log/syslogger/org.argeo.tp/org.argeo.tp.syslogger.2.1.jar \ + ../org.argeo.tp/com.fasterxml.jackson.core.jackson.annotations.2.14.jar \ + ../org.argeo.tp/com.fasterxml.jackson.core.jackson.core.2.14.jar \ + ../org.argeo.tp/com.fasterxml.jackson.core.jackson.databind.2.14.jar \ ../org.argeo.tp/javax.servlet.4.0.jar \ ../org.argeo.tp/javax.websocket.1.1.jar \ ../org.argeo.tp/org.apache.batik.1.16.jar \ @@@ -43,16 -53,40 +53,40 @@@ ../org.argeo.tp/org.w3c.css.sac.1.3.jar \ ../org.argeo.tp/org.w3c.dom.smil.1.0.jar \ ../org.argeo.tp/org.w3c.dom.svg.1.1.jar \ - ../org.argeo.tp.crypto/bcmail.1.72.jar \ - ../org.argeo.tp.crypto/bcpg.1.72.jar \ - ../org.argeo.tp.crypto/bcpkix.1.72.jar \ - ../org.argeo.tp.crypto/bcprov.1.72.jar \ - ../org.argeo.tp.crypto/bcutil.1.72.jar \ - ../org.argeo.tp.crypto/net.i2p.crypto.eddsa.0.3.jar \ - ../org.argeo.tp.crypto/org.apache.sshd.2.9.jar \ - ../org.argeo.tp.crypto/org.apache.sshd.cli.2.9.jar \ - ../org.argeo.tp.crypto/org.apache.sshd.git.2.9.jar \ - ../org.argeo.tp.crypto/org.apache.sshd.putty.2.9.jar \ - ../org.argeo.tp.crypto/org.apache.sshd.scp.2.9.jar \ - ../org.argeo.tp.crypto/org.apache.sshd.sftp.2.9.jar \ - ../org.argeo.tp.crypto/org.apache.tomcat.jni.9.0.jar \ + ../crypto/fips/org.argeo.tp.crypto/bcmail-fips.1.0.jar \ + ../crypto/fips/org.argeo.tp.crypto/bcmail-fips.1.0.src.jar \ + ../crypto/fips/org.argeo.tp.crypto/bc-noncert.1.0.jar \ + ../crypto/fips/org.argeo.tp.crypto/bc-noncert.1.0.src.jar \ + ../crypto/fips/org.argeo.tp.crypto/bcpg-fips.1.0.jar \ + ../crypto/fips/org.argeo.tp.crypto/bcpg-fips.1.0.src.jar \ + ../crypto/fips/org.argeo.tp.crypto/bcpkix-fips.1.0.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 \ + ../osgi/equinox/org.argeo.tp.osgi/org.apache.felix.scr.2.2.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.eclipse.equinox.console.1.4.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.3.18.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.services.3.11.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.eclipse.osgi.util.3.7.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.cm.1.6.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.component.1.5.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.coordinator.1.0.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.device.1.1.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.event.1.4.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.log.stream.1.0.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.metatype.1.4.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.prefs.1.1.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.provisioning.1.2.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.upnp.1.2.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.useradmin.1.1.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.service.wireadmin.1.0.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.util.function.1.2.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.util.measurement.1.0.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.util.position.1.0.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.util.promise.1.3.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.util.pushstream.1.1.jar \ + ../osgi/equinox/org.argeo.tp.osgi/org.osgi.util.xml.1.0.jar \ diff --cc sdk/argeo-build index a1d5c8e4b,552334af2..d9cae87d8 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit a1d5c8e4bbee31d104fc1151cac4a8e19f5ef1fa -Subproject commit 552334af25e7afe2d14d51ec2e78332bcbdc948c ++Subproject commit d9cae87d811258d5a13e43eea8492f3792377ce4