Prepare next development cycle

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 0fb70e075141888a54cfecc4398ac8cb3b164eec..0157735df2df4f16c0f29aa87ffdf1921269af33 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -6,43 +6,38 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.14.SNAPSHOT-r201605220948\r
-Import-Package: javax.jcr;version="[2.0,3)",\r
- javax.security.auth.callback;resolution:=optional,\r
- org.aopalliance.aop;version="[1.0,2)",\r
- org.argeo.security.core;version="[2.1,3)",\r
- org.argeo.slc.core.execution;version="[2.1,3)",\r
- org.argeo.slc.core.execution.tasks;version="[2.1,3)",\r
- org.argeo.slc.execution;version="[2.1,3)",\r
- org.argeo.slc.osgi;version="[2.1,3)",\r
- org.argeo.slc.repo;version="[2.1,3)",\r
- org.argeo.slc.repo.osgi;version="[2.1,3)",\r
- org.argeo.slc.test;version="[2.1,3)",\r
- org.springframework.aop;version="[3.2,4)",\r
- org.springframework.aop.framework;version="[3.2,4)",\r
- org.springframework.aop.scope;version="[3.2,4)",\r
- org.springframework.beans.factory.config;version="[3.2,4)",\r
- org.springframework.cglib.core;version="[3.2,4)",\r
- org.springframework.cglib.proxy;version="[3.2,4)",\r
- org.springframework.cglib.reflect;version="[3.2,4)",\r
- org.springframework.core.io;version="[3.2,4)"\r
+Bundle-Version: 2.1.15.SNAPSHOT-r201606030759\r
+Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback\r
+ ;resolution:=optional,org.aopalliance.aop;version="[1.0,2)",org.argeo.s\r
+ ecurity.core;version="[2.1,3)",org.argeo.slc.core.execution;version="[2\r
+ .1,3)",org.argeo.slc.core.execution.tasks;version="[2.1,3)",org.argeo.s\r
+ lc.execution;version="[2.1,3)",org.argeo.slc.osgi;version="[2.1,3)",org\r
+ .argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi;version="[2.1\r
+ ,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;versi\r
+ on="[3.2,4)",org.springframework.aop.framework;version="[3.2,4)",org.sp\r
+ ringframework.aop.scope;version="[3.2,4)",org.springframework.beans.fac\r
+ tory.config;version="[3.2,4)",org.springframework.cglib.core;version="[\r
+ 3.2,4)",org.springframework.cglib.proxy;version="[3.2,4)",org.springfra\r
+ mework.cglib.reflect;version="[3.2,4)",org.springframework.core.io;vers\r
+ ion="[3.2,4)"\r
 Include-Resource: META-INF/spring/eclipse.gemini.xml=META-INF/spring/ecl\r
  ipse.gemini.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/bouncy\r
  castle.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.\r
- equinox.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml\r
- ,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse.rap.xml,META-I\r
- NF/spring/apache.tomcat.xml=META-INF/spring/apache.tomcat.xml,META-INF/\r
- spring/apache.commons.xml=META-INF/spring/apache.commons.xml,META-INF/s\r
- pring/distribution.xml=META-INF/spring/distribution.xml,META-INF/spring\r
- /misc.xml=META-INF/spring/misc.xml,META-INF/spring/spring.security.xml=\r
- META-INF/spring/spring.security.xml,META-INF/spring/apache.xml=META-INF\r
- /spring/apache.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,ME\r
- TA-INF/spring/javax.xml=META-INF/spring/javax.xml,META-INF/spring/eclip\r
- se.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/apache.f\r
- elix.xml=META-INF/spring/apache.felix.xml,META-INF/spring/apache.ant.xm\r
- l=META-INF/spring/apache.ant.xml,META-INF/spring/spring.xml=META-INF/sp\r
- ring/spring.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/a\r
- pache.jackrabbit.xml\r
+ equinox.xml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/sp\r
+ ring/templates.xml=META-INF/spring/templates.xml,META-INF/spring/eclips\r
+ e.rap.xml=META-INF/spring/eclipse.rap.xml,META-INF/spring/apache.tomcat\r
+ .xml=META-INF/spring/apache.tomcat.xml,META-INF/spring/apache.commons.x\r
+ ml=META-INF/spring/apache.commons.xml,META-INF/spring/distribution.xml=\r
+ META-INF/spring/distribution.xml,META-INF/spring/misc.xml=META-INF/spri\r
+ ng/misc.xml,META-INF/spring/spring.security.xml=META-INF/spring/spring.\r
+ security.xml,META-INF/spring/apache.xml=META-INF/spring/apache.xml,META\r
+ -INF/spring/aether.xml=META-INF/spring/aether.xml,META-INF/spring/osgi.\r
+ xml=META-INF/spring/osgi.xml,META-INF/spring/javax.xml=META-INF/spring/\r
+ javax.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spring/eclipse.jet\r
+ ty.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xm\r
+ l,META-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-IN\r
+ F/spring/spring.xml=META-INF/spring/spring.xml,META-INF/spring/apache.j\r
+ ackrabbit.xml=META-INF/spring/apache.jackrabbit.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 c1cb5b83598860b3c35a4b2d2a86cadfd2c6bae8..e457d350bca1e537c653534e6c67d409afcc4ef5 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,7 +10,7 @@
        <!-- REGISTER -->
        <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.14" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.15" />
                <property name="modules">
                        <list>
                                <!-- Javax -->

diff --git a/pom.xml b/pom.xml
index 0178833710d1de3eee7e6c87d157bb576505ef4d..840fce4cf927eac4f7bd7c532a603a45ab93cccc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.2-SNAPSHOT</version>
+               <version>2.1.3</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.14-SNAPSHOT</version>
+       <version>2.1.15-SNAPSHOT</version>
        <name>Third Party Factory</name>
        <properties>
                <additionalImports.slc-lib>
@@ -62,8 +62,8 @@
        </dependencies>
        <repositories>
                <repository>
-                       <id>argeo-slc</id>
-                       <url>http://repo.argeo.org/data/public/java/argeo-slc-2.1</url>
+                       <id>argeo</id>
+                       <url>http://forge.argeo.org/data/public/java/argeo-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>