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

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 9f8e940969fc9f48140b09c518e156ead880f467..fb1bedf58c490e66eb7f632c5bcd090146f4d8da 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
@@ -10,12 +8,12 @@
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.3-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
-               <version.context>unstable</version.context>
+               <version.context>testing</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
        </properties>
        <modules>
@@ -121,12 +119,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-commons/</url>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <repositories>
@@ -142,18 +140,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>