Prepare next development cycle.

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 32864c5605e6fbe2be5ddbda8c6ebcaafaff4850..c2d7a969b0cae6e9b7886aea0829f15fe4710e6e 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -7,40 +7,39 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.24.r201905030600\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/misc.xml=META-INF/spring/misc.xml,META\r
- -INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,META-\r
- INF/spring/aether.xml=META-INF/spring/aether.xml,META-INF/spring/apache\r
- .xml=META-INF/spring/apache.xml,META-INF/spring/eclipse.rap.e3.xml=META\r
- -INF/spring/eclipse.rap.e3.xml,META-INF/spring/bouncycastle.xml=META-IN\r
- F/spring/bouncycastle.xml,META-INF/spring/eclipse.rap.e4.xml=META-INF/s\r
- pring/eclipse.rap.e4.xml,META-INF/spring/spring.security.xml=META-INF/s\r
- pring/spring.security.xml,META-INF/spring/javax.xml=META-INF/spring/jav\r
- ax.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spring/eclipse.jetty.\r
- xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.rcp.e4.x\r
- ml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/ap\r
- ache.tomcat.xml=META-INF/spring/apache.tomcat.xml,META-INF/spring/apach\r
- e.commons.xml=META-INF/spring/apache.commons.xml,META-INF/spring/sdk.xm\r
- l=META-INF/spring/sdk.xml,META-INF/spring/apache.ant.xml=META-INF/sprin\r
- g/apache.ant.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/\r
- apache.jackrabbit.xml,META-INF/spring/templates.xml=META-INF/spring/tem\r
- plates.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache.feli\r
- x.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF/sp\r
- ring/distribution.xml=META-INF/spring/distribution.xml,META-INF/spring/\r
- eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml\r
+Bundle-Version: 2.1.25.SNAPSHOT-r201910040604\r
+Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring,org.arg\r
+ eo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi;version="[2.1,3)"\r
+ ,org.springframework.cglib.proxy;version="[3.2,4)",org.springframework.\r
+ cglib.core;version="[3.2,4)",org.springframework.cglib.reflect;version=\r
+ "[3.2,4)",org.aopalliance.aop;version="[1.0,2)",org.argeo.slc.core.exec\r
+ ution;version="[2.1,3)",org.argeo.slc.core.execution.tasks;version="[2.\r
+ 1,3)",org.argeo.slc.execution;version="[2.1,3)",org.argeo.slc.osgi;vers\r
+ ion="[2.1,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.\r
+ aop;version="[3.2,4)",org.springframework.aop.framework;version="[3.2,4\r
+ )",org.springframework.aop.scope;version="[3.2,4)",org.springframework.\r
+ beans.factory.config;version="[3.2,4)",org.springframework.core.io;vers\r
+ ion="[3.2,4)",javax.security.auth.callback;resolution:=optional\r
+Include-Resource: META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META\r
+ -INF/spring/eclipse.rap.e4.xml=META-INF/spring/eclipse.rap.e4.xml,META-\r
+ INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,META-I\r
+ NF/spring/distribution.xml=META-INF/spring/distribution.xml,META-INF/sp\r
+ ring/apache.xml=META-INF/spring/apache.xml,META-INF/spring/misc.xml=MET\r
+ A-INF/spring/misc.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/sp\r
+ ring/apache.jackrabbit.xml,META-INF/spring/apache.ant.xml=META-INF/spri\r
+ ng/apache.ant.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/boun\r
+ cycastle.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache.fe\r
+ lix.xml,META-INF/spring/aether.xml=META-INF/spring/aether.xml,META-INF/\r
+ spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.rcp.e4.xml,META-INF/s\r
+ pring/javax.xml=META-INF/spring/javax.xml,META-INF/spring/sdk.xml=META-\r
+ INF/spring/sdk.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/ap\r
+ ache.tomcat.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spring/eclip\r
+ se.jetty.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META\r
+ -INF/spring/eclipse.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml,META-\r
+ INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml,META\r
+ -INF/spring/spring.security.xml=META-INF/spring/spring.security.xml,MET\r
+ A-INF/spring/templates.xml=META-INF/spring/templates.xml,META-INF/sprin\r
+ g/apache.commons.xml=META-INF/spring/apache.commons.xml\r
 Private-Package: !*\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 7a17f19a87c27128ec203f29499d8ba618d2ba29..cd8de55b4f7ff9100a98cc1475c5aac65ad3aae1 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.24" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.25-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -125,7 +125,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.24" />
+                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.25-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -137,7 +137,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.24" />
+                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.25-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -149,7 +149,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.24" />
+                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.25-SNAPSHOT" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />

diff --git a/pom.xml b/pom.xml
index f5e45fd6a354736da104ba6ed08339c66d1a71d1..c9f3d96399122a7bc5bd0cdb92009cc3c0f25959 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.15</version>
+               <version>2.1.16</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.24</version>
+       <version>2.1.25-SNAPSHOT</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>
@@ -36,7 +36,8 @@
                <plugins>
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <artifactId>argeo-osgi-plugin</artifactId>
+                               <version>2.1.1</version>
                                <executions>
                                        <execution>
                                                <id>generate-descriptors</id>