Merge branch 'v2.x'

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

diff --git a/pom.xml b/pom.xml
index 08b6c5d2febb12ec5ba653f88f11e58688fc0efa..bee12d0551187087f7005b79effdfd62c57ad4b3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.maven</groupId>
@@ -7,17 +9,18 @@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <packaging>pom</packaging>
+       <version>2.3.1-SNAPSHOT</version>
        <name>Argeo Suite</name>
-       <description />
-       <version>2.1.18</version>
+       <packaging>pom</packaging>
+       <url>http://www.argeo.org/</url>
        <properties>
                <!-- 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.100</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>
@@ -38,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>argeo-suite-2.1.18</tag>
+               <tag>HEAD</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@ -105,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>
@@ -174,6 +189,11 @@
                </plugins>
        </reporting>
        <distributionManagement>
+               <repository>
+                       <id>staging</id>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
+                       <uniqueVersion>false</uniqueVersion>
+               </repository>
                <site>
                        <id>staging</id>
                        <url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>