Adapt to changes in SLC.

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index c240da28a1e893807bd4a0675feb6ed802752321..2ab0c3e50e50f6c532cc09524ef33d50a24af12e 100644 (file)
--- 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\r
 Bundle-ManifestVersion: 2\r
 Bundle-Name: Argeo Third Party Factory\r
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
+Bundle-RequiredExecutionEnvironment: JavaSE-11,JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.27.r201911272021\r
+Bundle-Version: 2.1.28.SNAPSHOT-r20200215110733\r
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version\r
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi\r
- ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or\r
- g.springframework.cglib.core;version="[3.2,4)",org.springframework.cgli\r
- b.reflect;version="[3.2,4)",org.aopalliance.aop;version="[1.0,2)",org.a\r
- rgeo.slc.core.execution;version="[2.1,3)",org.argeo.slc.core.execution.\r
- tasks;version="[2.1,3)",org.argeo.slc.execution;version="[2.1,3)",org.a\r
- rgeo.slc.osgi;version="[2.1,3)",org.argeo.slc.test;version="[2.1,3)",or\r
- g.springframework.aop;version="[3.2,4)",org.springframework.aop.framewo\r
- rk;version="[3.2,4)",org.springframework.aop.scope;version="[3.2,4)",or\r
- g.springframework.beans.factory.config;version="[3.2,4)",org.springfram\r
- ework.core.io;version="[3.2,4)",javax.security.auth.callback;resolution\r
- :=optional\r
-Include-Resource: META-INF/spring/jackson.xml=META-INF/spring/jackson.xm\r
- l,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/ecl\r
- ipse.rap.e4.xml=META-INF/spring/eclipse.rap.e4.xml,META-INF/spring/dist\r
- ribution.xml=META-INF/spring/distribution.xml,META-INF/spring/apache.xm\r
- l=META-INF/spring/apache.xml,META-INF/spring/misc.xml=META-INF/spring/m\r
- isc.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.ja\r
- ckrabbit.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/bouncycas\r
- tle.xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.rcp.\r
- e4.xml,META-INF/spring/javax.xml=META-INF/spring/javax.xml,META-INF/spr\r
- ing/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/eclipse.jetty.xml=M\r
- ETA-INF/spring/eclipse.jetty.xml,META-INF/spring/eclipse.rap.e3.xml=MET\r
- A-INF/spring/eclipse.rap.e3.xml,META-INF/spring/eclipse.equinox.xml=MET\r
- A-INF/spring/eclipse.equinox.xml,META-INF/spring/templates.xml=META-INF\r
- /spring/templates.xml,META-INF/spring/apache.commons.xml=META-INF/sprin\r
- g/apache.commons.xml\r
+ ;version="[2.1,3)",org.springframework.cglib.proxy;resolution:=optional\r
+ ;version="[3.2,4)",org.springframework.cglib.core;resolution:=optional;\r
+ version="[3.2,4)",org.springframework.cglib.reflect;resolution:=optiona\r
+ l;version="[3.2,4)",org.aopalliance.aop;resolution:=optional;version="[\r
+ 1.0,2)",org.argeo.slc.runtime;version="[2.1,3)",org.argeo.slc.core.exec\r
+ ution;resolution:=optional;version="[2.1,3)",org.argeo.slc.core.executi\r
+ on.tasks;resolution:=optional;version="[2.1,3)",org.argeo.slc.execution\r
+ ;version="[2.1,3)",org.argeo.slc.osgi;resolution:=optional;version="[2.\r
+ 1,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;reso\r
+ lution:=optional;version="[3.2,4)",org.springframework.aop.framework;re\r
+ solution:=optional;version="[3.2,4)",org.springframework.aop.scope;reso\r
+ lution:=optional;version="[3.2,4)",org.springframework.beans.factory.co\r
+ nfig;resolution:=optional;version="[3.2,4)",org.springframework.core.io\r
+ ;resolution:=optional;version="[3.2,4)",javax.security.auth.callback;re\r
+ solution:=optional\r
+Include-Resource: META-INF/spring/eclipse.jetty.xml=META-INF/spring/ecli\r
+ pse.jetty.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclip\r
+ se.equinox.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apach\r
+ e.commons.xml,META-INF/spring/misc.xml=META-INF/spring/misc.xml,META-IN\r
+ F/spring/jackson.xml=META-INF/spring/jackson.xml,META-INF/spring/templa\r
+ tes.xml=META-INF/spring/templates.xml,META-INF/spring/javax.xml=META-IN\r
+ F/spring/javax.xml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META\r
+ -INF/spring/apache.xml=META-INF/spring/apache.xml,META-INF/spring/eclip\r
+ se.rcp.e4.xml=META-INF/spring/eclipse.rcp.e4.xml,META-INF/spring/eclips\r
+ e.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml,META-INF/spring/apache.\r
+ jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,META-INF/spring/di\r
+ stribution.xml=META-INF/spring/distribution.xml,META-INF/spring/osgi.xm\r
+ l=META-INF/spring/osgi.xml,META-INF/spring/eclipse.rap.e4.xml=META-INF/\r
+ spring/eclipse.rap.e4.xml,META-INF/spring/bouncycastle.xml=META-INF/spr\r
+ ing/bouncycastle.xml,META-INF/MANIFEST.MF=META-INF/MANIFEST.MF\r
 Private-Package: !*\r
+SLC-BuildTimestamp: 20200215110733\r
 SLC-Category: org.argeo.tp.factory\r
 SLC-ExecutionModule: default\r

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 1bc30666807d4734dc2f123385d3d75bfa8b83f1..9edbd77171e11b9d951c73fdc987d29b657c7a57 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,7 +13,7 @@
        <bean id="argeo-tp"
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.27" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.28-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -129,7 +129,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.27" />
+                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.28-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -141,7 +141,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.27" />
+                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.28-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -155,7 +155,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.27" />
+                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.28-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />

diff --git a/pom.xml b/pom.xml
index c55050c33827f1195d1f21b4ed894d388fde010d..24e003c8dec676bb33018b4baa09f7915d78f4c4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.16</version>
+               <version>2.1.17-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.27</version>
+       <version>2.1.28-SNAPSHOT</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>