From c9da2352e287da05223074d5f356270db47b379a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 4 Oct 2019 08:05:54 +0200
Subject: [PATCH] Prepare next development cycle.

---
 META-INF/MANIFEST.MF             | 67 ++++++++++++++++----------------
 META-INF/spring/distribution.xml |  8 ++--
 pom.xml                          |  7 ++--
 3 files changed, 41 insertions(+), 41 deletions(-)

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