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

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

diff --git a/pom.xml b/pom.xml
index 68da924b8fccc99fd78cb1d909ca42b8ed9ec383..661b19441c5e571ba67898ce0db3eb21a4bd3001 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,18 +9,16 @@
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <version>2.3-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <properties>
+               <version.context>testing</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 
-               <version.slc>2.3-SNAPSHOT</version.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-               <developmentCycle.slc>2.3</developmentCycle.slc>
-               <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
-
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+               <developmentCycle.slc>2.1</developmentCycle.slc>
+               <version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
        </properties>
        <modules>
                <!-- SLC framework -->
@@ -33,12 +31,12 @@
                <!-- CMS extensions -->
                <module>cms</module>
 
-               <!-- Legacy -->
-               <module>legacy</module>
-
                <!-- Distribution -->
                <module>dep</module>
                <module>ide</module>
+
+               <!-- Legacy -->
+               <module>legacy</module>
        </modules>
        <url>http://projects.argeo.org/slc/</url>
        <scm>
@@ -131,18 +129,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>
                <!-- Disable Maven default repository -->
                <repository>
                        <id>central</id>
@@ -158,7 +144,7 @@
        <distributionManagement>
                <site>
                        <id>staging</id>
-                       <url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
                </site>
        </distributionManagement>
        <profiles>
@@ -167,7 +153,7 @@
                        <repositories>
                                <repository>
                                        <id>argeo-extras</id>
-                                       <url>http://localhost:7080/data/java/argeo-extras-2.3</url>
+                                       <url>http://localhost:7080/data/java/argeo-extras-2.1</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>