Merge remote-tracking branch 'origin/unstable' into testing

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

diff --git a/pom.xml b/pom.xml
index 04472d37241475a7f135a2a966088d2f7e96cc1c..6a5c822d474af8930d74d5568e332c6d80a9ae8b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,21 +3,21 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.6</version>
+               <version>2.1.7</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.3.2</version>
+       <version>2.1-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
-               <version.context>unstable</version.context>
+               <version.context>testing</version.context>
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
-               <version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
-               <!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
+               <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
+               <!-- <version.argeo-rcp>2.1-SNAPSHOT</version.argeo-rcp> -->
                <git.rw />
        </properties>
        <modules>
@@ -50,7 +50,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.3.2</tag>
+               <tag>HEAD</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@ -117,18 +117,6 @@
                                <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>
@@ -200,12 +188,12 @@
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>
                        <id>staging</id>
-                       <url>file:///srv/docfactory/argeo-2.3/site/argeo-suite/</url>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>
                </site>
        </distributionManagement>
 </project>