From: Mathieu Baudier Date: Sat, 15 Feb 2020 11:12:36 +0000 (+0100) Subject: Adapt to changes in SLC. X-Git-Tag: v2.3.9~27 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=585573bd4db81adf7c81abe52977390b74e0162e Adapt to changes in SLC. --- diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index c240da2..2ab0c3e 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -5,37 +5,42 @@ Bundle-Description: OSGi packaging of free / open source third party lib Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-ManifestVersion: 2 Bundle-Name: Argeo Third Party Factory -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8 Bundle-SymbolicName: org.argeo.tp.factory.core -Bundle-Version: 2.1.27.r201911272021 +Bundle-Version: 2.1.28.SNAPSHOT-r20200215110733 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi - ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or - g.springframework.cglib.core;version="[3.2,4)",org.springframework.cgli - b.reflect;version="[3.2,4)",org.aopalliance.aop;version="[1.0,2)",org.a - rgeo.slc.core.execution;version="[2.1,3)",org.argeo.slc.core.execution. - tasks;version="[2.1,3)",org.argeo.slc.execution;version="[2.1,3)",org.a - rgeo.slc.osgi;version="[2.1,3)",org.argeo.slc.test;version="[2.1,3)",or - g.springframework.aop;version="[3.2,4)",org.springframework.aop.framewo - rk;version="[3.2,4)",org.springframework.aop.scope;version="[3.2,4)",or - g.springframework.beans.factory.config;version="[3.2,4)",org.springfram - ework.core.io;version="[3.2,4)",javax.security.auth.callback;resolution - :=optional -Include-Resource: META-INF/spring/jackson.xml=META-INF/spring/jackson.xm - l,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/ecl - ipse.rap.e4.xml=META-INF/spring/eclipse.rap.e4.xml,META-INF/spring/dist - ribution.xml=META-INF/spring/distribution.xml,META-INF/spring/apache.xm - l=META-INF/spring/apache.xml,META-INF/spring/misc.xml=META-INF/spring/m - isc.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.ja - ckrabbit.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/bouncycas - tle.xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.rcp. - e4.xml,META-INF/spring/javax.xml=META-INF/spring/javax.xml,META-INF/spr - ing/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/eclipse.jetty.xml=M - ETA-INF/spring/eclipse.jetty.xml,META-INF/spring/eclipse.rap.e3.xml=MET - A-INF/spring/eclipse.rap.e3.xml,META-INF/spring/eclipse.equinox.xml=MET - A-INF/spring/eclipse.equinox.xml,META-INF/spring/templates.xml=META-INF - /spring/templates.xml,META-INF/spring/apache.commons.xml=META-INF/sprin - g/apache.commons.xml + ;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:=optiona + l;version="[3.2,4)",org.aopalliance.aop;resolution:=optional;version="[ + 1.0,2)",org.argeo.slc.runtime;version="[2.1,3)",org.argeo.slc.core.exec + ution;resolution:=optional;version="[2.1,3)",org.argeo.slc.core.executi + on.tasks;resolution:=optional;version="[2.1,3)",org.argeo.slc.execution + ;version="[2.1,3)",org.argeo.slc.osgi;resolution:=optional;version="[2. + 1,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;reso + lution:=optional;version="[3.2,4)",org.springframework.aop.framework;re + solution:=optional;version="[3.2,4)",org.springframework.aop.scope;reso + lution:=optional;version="[3.2,4)",org.springframework.beans.factory.co + nfig;resolution:=optional;version="[3.2,4)",org.springframework.core.io + ;resolution:=optional;version="[3.2,4)",javax.security.auth.callback;re + solution:=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,META-INF/MANIFEST.MF=META-INF/MANIFEST.MF Private-Package: !* +SLC-BuildTimestamp: 20200215110733 SLC-Category: org.argeo.tp.factory SLC-ExecutionModule: default diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml index 1bc3066..9edbd77 100644 --- a/META-INF/spring/distribution.xml +++ b/META-INF/spring/distribution.xml @@ -13,7 +13,7 @@ - + @@ -129,7 +129,7 @@ class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl" init-method="init" destroy-method="destroy"> + value="org.argeo.tp:argeo-tp-rap-e4:2.1.28-SNAPSHOT" /> @@ -141,7 +141,7 @@ class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl" init-method="init" destroy-method="destroy"> + value="org.argeo.tp:argeo-tp-rcp-e4:2.1.28-SNAPSHOT" /> @@ -155,7 +155,7 @@ class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl" init-method="init" destroy-method="destroy"> + value="org.argeo.tp:argeo-tp-rap-e3:2.1.28-SNAPSHOT" /> diff --git a/pom.xml b/pom.xml index c55050c..24e003c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.argeo.slc lib - 2.1.16 + 2.1.17-SNAPSHOT org.argeo.tp.factory org.argeo.tp.factory.core - 2.1.27 + 2.1.28-SNAPSHOT Argeo Third Party Factory OSGi packaging of free / open source third party libraries