Merge remote-tracking branch 'origin/v2.x'

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

diff --git a/cms/pom.xml b/cms/pom.xml
index 4864e5e44f69209a591ed80b05a15e14fba99b94..80104f398484b26ab15c12f1de79d27bae815b3a 100644 (file)
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -1,28 +1,26 @@
-<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>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.2</version>
+               <version>2.1.3</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc-cms</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC CMS</name>
-       <version>2.1.17-SNAPSHOT</version>
+       <version>2.3.1-SNAPSHOT</version>
        <properties>
                <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.91-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
 
                <version.slc>2.1.17-SNAPSHOT</version.slc>
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
                <developmentCycle.slc>2.1</developmentCycle.slc>
-               <version.argeo-commons-legacy>2.1.86-SNAPSHOT</version.argeo-commons-legacy>
+               <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
        </properties>
        <modules>
                <!-- Argeo CMS extensions -->
@@ -34,21 +32,20 @@
                <module>org.argeo.slc.runtime</module>
                <module>org.argeo.slc.jcr</module>
 
-               <!-- Runtime -->
-               <module>org.argeo.slc.spring</module>
-               <module>org.argeo.slc.support</module>
+               <!--  SLC Repo -->
                <module>org.argeo.slc.repo</module>
                <module>org.argeo.slc.factory</module>
+
+               <!-- Legacy Runtime -->
+               <module>org.argeo.slc.spring</module>
+               <module>org.argeo.slc.support</module>
                <module>org.argeo.slc.launcher</module>
 
-               <!-- Modules -->
+               <!-- Legacy Modules -->
                <module>org.argeo.slc.agent</module>
                <module>org.argeo.slc.agent.jcr</module>
                <module>org.argeo.slc.server.repo</module>
 
-               <!-- E4 -->
-               <module>org.argeo.slc.e4</module>
-
                <!-- Legacy UI -->
                <module>org.argeo.slc.client.ui</module>
                <module>org.argeo.slc.client.ui.dist</module>
@@ -123,21 +120,50 @@
        <repositories>
                <repository>
                        <id>argeo</id>
-                       <url>http://repo.argeo.org/data/java/argeo-2.1/</url>
+                       <url>http://forge.argeo.org/data/java/argeo-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
                </repository>
                <repository>
                        <id>argeo-extras</id>
-                       <url>http://repo.argeo.org/data/java/argeo-extras-2.1/</url>
+                       <url>http://forge.argeo.org/data/java/argeo-extras-2.1/</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
+                       <snapshots>
+                               <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>
+                       <url>http://repo1.maven.org/maven2</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
                </repository>
        </repositories>
        <reporting>
@@ -210,7 +236,7 @@
        <distributionManagement>
                <site>
                        <id>staging</id>
-                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
+                       <url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
                </site>
        </distributionManagement>
        <profiles>
@@ -219,7 +245,7 @@
                        <repositories>
                                <repository>
                                        <id>argeo-extras</id>
-                                       <url>http://localhost:7080/data/java/argeo-extras-2.1</url>
+                                       <url>http://localhost:7080/data/java/argeo-extras-2.3</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>