From: mbaudier Date: Thu, 4 Nov 2021 07:46:11 +0000 (+0100) Subject: Use latest Argeo SLC. X-Git-Tag: v2.3.9~21 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c7eafe2899627e22ac5e91b11482ecc57d29e6ce;p=gpl%2Fargeo-tp.git Use latest Argeo SLC. --- diff --git a/demo/slc_localrepo.properties b/demo/slc_localrepo.properties index a897633..130b214 100644 --- a/demo/slc_localrepo.properties +++ b/demo/slc_localrepo.properties @@ -1,6 +1,5 @@ argeo.osgi.start.2.http=\ org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.http.jetty,\ org.eclipse.equinox.cm,\ org.eclipse.rap.rwt.osgi diff --git a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF index 8864921..03c608f 100644 --- a/org.argeo.tp.factory.core/META-INF/MANIFEST.MF +++ b/org.argeo.tp.factory.core/META-INF/MANIFEST.MF @@ -2,18 +2,20 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.argeo.tp.factory.core Bundle-Description: OSGi packaging of free / open source third party lib raries -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-License: https://www.gnu.org/licenses/lgpl-3.0.txt Bundle-ManifestVersion: 2 Bundle-Name: Core Third Party Factory Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8 Bundle-SymbolicName: org.argeo.tp.factory.core -Bundle-Version: 2.1.28.SNAPSHOT-r20200320074906 +Bundle-Vendor: Argeo GmbH +Bundle-Version: 2.1.28.SNAPSHOT-r20211104073959 Import-Package: javax.jcr;version="[2.0,3)", org.argeo.slc.repo;version="[2.1,3)", org.argeo.slc.repo.osgi;version="[2.1,3)", org.argeo.slc.spring.auth;version="[2.1,3)", org.argeo.slc.spring.repo.osgi;version="[2.1,3)", + org.argeo.security.jackrabbit;resolution:=optional;version="[2.1,3)", org.springframework.cglib.proxy;resolution:=optional;version="[3.2,4)", org.springframework.cglib.core;resolution:=optional;version="[3.2,4)", org.springframework.cglib.reflect;resolution:=optional;version="[3.2,4) @@ -34,22 +36,22 @@ Import-Package: [3.2,4)", org.springframework.core.io;resolution:=optional;version="[3.2,4)", javax.security.auth.callback;resolution:=optional -Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli - pse.jetty.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclip - se.equinox.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apach - e.commons.xml,META-INF/spring/misc.xml=META-INF/spring/misc.xml,META-IN - F/spring/jackson.xml=META-INF/spring/jackson.xml,META-INF/spring/templa - tes.xml=META-INF/spring/templates.xml,META-INF/spring/javax.xml=META-IN - F/spring/javax.xml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META - -INF/spring/apache.xml=META-INF/spring/apache.xml,META-INF/spring/eclip - se.rcp.e4.xml=META-INF/spring/eclipse.rcp.e4.xml,META-INF/spring/eclips - e.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml,META-INF/spring/apache. - jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,META-INF/spring/di - stribution.xml=META-INF/spring/distribution.xml,META-INF/spring/osgi.xm - l=META-INF/spring/osgi.xml,META-INF/spring/eclipse.rap.e4.xml=META-INF/ - spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr - ing/bouncycastle.xml +Include-Resource: META-INF/spring/eclipse.rap.e4.xml=META-INF/spring/ecl + ipse.rap.e4.xml,META-INF/spring/templates.xml=META-INF/spring/templates + .xml,META-INF/spring/distribution.xml=META-INF/spring/distribution.xml, + META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/eclip + se.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml,META-INF/spring/javax. + xml=META-INF/spring/javax.xml,META-INF/spring/eclipse.rcp.e4.xml=META-I + NF/spring/eclipse.rcp.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/ + spring/bouncycastle.xml,META-INF/spring/eclipse.equinox.xml=META-INF/sp + ring/eclipse.equinox.xml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xm + l,META-INF/spring/jackson.xml=META-INF/spring/jackson.xml,META-INF/spri + ng/eclipse.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/ + apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,META-INF/sp + ring/apache.commons.xml=META-INF/spring/apache.commons.xml,META-INF/spr + ing/apache.xml=META-INF/spring/apache.xml,META-INF/spring/misc.xml=META + -INF/spring/misc.xml Private-Package: !* -SLC-Build-Timestamp: 20200320074906 +SLC-Build-Timestamp: 20211104073959 SLC-Category: org.argeo.tp.factory SLC-ExecutionModule: default diff --git a/org.argeo.tp.factory.core/pom.xml b/org.argeo.tp.factory.core/pom.xml index 00c507d..1e6bb97 100644 --- a/org.argeo.tp.factory.core/pom.xml +++ b/org.argeo.tp.factory.core/pom.xml @@ -5,7 +5,7 @@ org.argeo.slc lib - 2.1.17-SNAPSHOT + 2.1.18-SNAPSHOT org.argeo.tp.factory org.argeo.tp.factory.core diff --git a/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF b/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF index 81c9739..15ff3de 100644 --- a/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF +++ b/org.argeo.tp.factory.extras/META-INF/MANIFEST.MF @@ -2,18 +2,20 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.argeo.tp.factory.extras Bundle-Description: SLC execution modules for generic tasks, to be used as parent pom -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-License: https://www.gnu.org/licenses/lgpl-3.0.txt Bundle-ManifestVersion: 2 Bundle-Name: Extras Third Party Factory Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8 Bundle-SymbolicName: org.argeo.tp.factory.extras -Bundle-Version: 2.1.14.SNAPSHOT-r20200320074906 +Bundle-Vendor: Argeo GmbH +Bundle-Version: 2.1.14.SNAPSHOT-r20211104073959 Import-Package: javax.jcr;version="[2.0,3)", org.argeo.slc.repo;version="[2.1,3)", org.argeo.slc.repo.osgi;version="[2.1,3)", org.argeo.slc.spring.auth;version="[2.1,3)", org.argeo.slc.spring.repo.osgi;version="[2.1,3)", + org.argeo.security.jackrabbit;resolution:=optional;version="[2.1,3)", org.springframework.cglib.proxy;resolution:=optional;version="[3.2,4)", org.springframework.cglib.core;resolution:=optional;version="[3.2,4)", org.springframework.cglib.reflect;resolution:=optional;version="[3.2,4) @@ -34,22 +36,22 @@ Import-Package: [3.2,4)", org.springframework.core.io;resolution:=optional;version="[3.2,4)", javax.security.auth.callback;resolution:=optional -Include-Resource: META-INF/spring/scripting.xml=META-INF/spring/scriptin - g.xml,META-INF/spring/swagger.xml=META-INF/spring/swagger.xml,META-INF/ - spring/templates.xml=META-INF/spring/templates.xml,META-INF/spring/graa - lvm.xml=META-INF/spring/graalvm.xml,META-INF/spring/jersey.xml=META-INF - /spring/jersey.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/ap - ache.tomcat.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache - .felix.xml,META-INF/spring/extras.xml=META-INF/spring/extras.xml,META-I - NF/spring/ws.xml=META-INF/spring/ws.xml,META-INF/spring/distribution.xm - l=META-INF/spring/distribution.xml,META-INF/spring/apache.ant.xml=META- - INF/spring/apache.ant.xml,META-INF/spring/eclipse.gemini.xml=META-INF/s - pring/eclipse.gemini.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi. - xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF/spri - ng/spring.security.xml=META-INF/spring/spring.security.xml,META-INF/spr - ing/payment.xml=META-INF/spring/payment.xml,META-INF/MANIFEST.MF=META-I - NF/MANIFEST.MF +Include-Resource: META-INF/MANIFEST.MF=META-INF/MANIFEST.MF,META-INF/spr + ing/payment.xml=META-INF/spring/payment.xml,META-INF/spring/templates.x + ml=META-INF/spring/templates.xml,META-INF/spring/spring.security.xml=ME + TA-INF/spring/spring.security.xml,META-INF/spring/distribution.xml=META + -INF/spring/distribution.xml,META-INF/spring/apache.tomcat.xml=META-INF + /spring/apache.tomcat.xml,META-INF/spring/ws.xml=META-INF/spring/ws.xml + ,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/ecli + pse.gemini.xml=META-INF/spring/eclipse.gemini.xml,META-INF/spring/graal + vm.xml=META-INF/spring/graalvm.xml,META-INF/spring/spring.xml=META-INF/ + spring/spring.xml,META-INF/spring/jersey.xml=META-INF/spring/jersey.xml + ,META-INF/spring/swagger.xml=META-INF/spring/swagger.xml,META-INF/sprin + g/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF/spring/apa + che.ant.xml=META-INF/spring/apache.ant.xml,META-INF/spring/scripting.xm + l=META-INF/spring/scripting.xml,META-INF/spring/extras.xml=META-INF/spr + ing/extras.xml Private-Package: !* -SLC-Build-Timestamp: 20200320074906 +SLC-Build-Timestamp: 20211104073959 SLC-Category: org.argeo.tp.factory SLC-ExecutionModule: default diff --git a/org.argeo.tp.factory.extras/pom.xml b/org.argeo.tp.factory.extras/pom.xml index 5bef932..d20bba1 100644 --- a/org.argeo.tp.factory.extras/pom.xml +++ b/org.argeo.tp.factory.extras/pom.xml @@ -5,7 +5,7 @@ org.argeo.slc lib - 2.1.17-SNAPSHOT + 2.1.18-SNAPSHOT org.argeo.tp.factory org.argeo.tp.factory.extras