Merge branch 'v2.x'

[gpl/argeo-suite.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index fcb8d3dfabd1ce17b1d2d1d2db56b1e244c5b5e3..bee12d0551187087f7005b79effdfd62c57ad4b3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.1.19-SNAPSHOT</version>
+       <version>2.3.1-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
@@ -17,9 +17,10 @@
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.101-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>[2.1.102,2.3.0-SNAPSHOT)</version.argeo-commons>
+               <version.argeo-suite-icons>[2.1.1,2.3.0-SNAPSHOT)</version.argeo-suite-icons>
 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>
@@ -40,7 +41,7 @@
                <connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
                <url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
                <developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
-               <tag>v2.x</tag>
+               <tag>HEAD</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@ -107,6 +108,18 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
+               <repository>
+                       <id>argeo-unstable</id>
+                       <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
        </repositories>
        <reporting>
                <plugins>
@@ -178,7 +191,7 @@
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>