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

Conflicts:
	pom.xml

diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml
index c0723fe8414d98fa6787f767005293bb1e3bbab9..a4dde0f67271fec8b46ad08c2f0b337fb97ebc8f 100644 (file)
--- a/core/org.argeo.entity.api/pom.xml
+++ b/core/org.argeo.entity.api/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.api</artifactId>

diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml
index 39b697e72ea132c5bff5fd50249f947f41f11d70..a4a14d2217006bdafe34ec1baf60aa0b486f78f5 100644 (file)
--- a/core/org.argeo.entity.core/pom.xml
+++ b/core/org.argeo.entity.core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.core</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml
index d635fbf8664096d7c4b00ed3a490b26239b8844a..2ead60f58c71c0f716be7b3191223dcf7d002881 100644 (file)
--- a/core/org.argeo.entity.ui/pom.xml
+++ b/core/org.argeo.entity.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml
index 0c1d40bef094797c77183662f63583cbd19f02d2..149b4373fec7170712f8fbcd744403bc6c18f035 100644 (file)
--- a/core/org.argeo.suite.core/pom.xml
+++ b/core/org.argeo.suite.core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.core</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.suite.theme.default/pom.xml b/core/org.argeo.suite.theme.default/pom.xml
index e9f009237426d36f0d6d0c0d88f9b731c058a992..8c69f9ec3335cfa6808b968306e5c80d77530b0d 100644 (file)
--- a/core/org.argeo.suite.theme.default/pom.xml
+++ b/core/org.argeo.suite.theme.default/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.theme.default</artifactId>

diff --git a/core/org.argeo.suite.ui.rap/pom.xml b/core/org.argeo.suite.ui.rap/pom.xml
index a8a1e80bef085bf917230586a029dd8af1b01770..74c3b91ec5934bab10527ecd5a33acf4df2a7934 100644 (file)
--- a/core/org.argeo.suite.ui.rap/pom.xml
+++ b/core/org.argeo.suite.ui.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.ui.rap</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml
index 2436864320daf359a1f7f1879b4515fbfbefe05f..48582979b490ad88d7b1fd0123137513e16d53fe 100644 (file)
--- a/core/org.argeo.suite.ui/pom.xml
+++ b/core/org.argeo.suite.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.ui</artifactId>
@@ -14,12 +14,12 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/pom.xml b/core/pom.xml
index a8ef5a0355662cf19ca29d2b89c61e221aa17c93..9df323000b46dff1509a8c27a2fa3e95600370fd 100644 (file)
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>core</artifactId>

diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index 30ff3b6bea805afe043965317b45ee180d047dc8..cadf22d5fcccbd08ba1a926e916425b693ecc5db 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 

diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index a70a582902de3525625afe0a2f05c5253b46b037..d2058163a04fe69c738f9f0bbedc366d8dbad773 100644 (file)
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@ -15,17 +15,17 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Suite Icons -->
@@ -39,67 +39,67 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.theme.default</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui.rap</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo People -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.people.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Library -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.documents.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Environment -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.geo.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Publishing -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.publishing.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Knowledge -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.odk</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.geonames</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Additional Third Parties -->

diff --git a/dep/pom.xml b/dep/pom.xml
index 60dc03490ecca4a50f22501d700131fbfc721d10..9fe189be7fe0c372d7186bf4552bc225fccc536e 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>

diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml
index dc4c578342dd7de45cc195f3cb347fb210ea40ca..61df24f1e1510ab00eb3cdfbb8718ee414e28c43 100644 (file)
--- a/dist/argeo-office/pom.xml
+++ b/dist/argeo-office/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-office</artifactId>
@@ -28,7 +28,7 @@
                                <dependency>
                                        <groupId>org.argeo.suite</groupId>
                                        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-                                       <version>2.3.1-SNAPSHOT</version>
+                                       <version>2.1.21-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>

diff --git a/dist/argeo-suite-demo/pom.xml b/dist/argeo-suite-demo/pom.xml
index c31fc7dedb6a8fb60fa3b433b534b5f6706997ae..7b6ffedbbbad6271327f753a01e94ee0119a80ba 100644 (file)
--- a/dist/argeo-suite-demo/pom.xml
+++ b/dist/argeo-suite-demo/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-suite-demo</artifactId>

diff --git a/dist/pom.xml b/dist/pom.xml
index 38c2521bfd38c7e756b3b4dcecfc43e3860f4a44..597ff6956fc84cf851cec1ad8846884ea933bc92 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>

diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml
index a5a4711db8257aad207f5721336fb343ada01c34..ed2de0bcea649a6ea031d5200a34b2bb2f09864e 100644 (file)
--- a/environment/org.argeo.geo.ui/pom.xml
+++ b/environment/org.argeo.geo.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>environment</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.geo.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/environment/pom.xml b/environment/pom.xml
index 7e13702d56a5fca8f60e97d81431bdb927448625..c296c6bfbf2b1050c584abb414ae27219c3a971c 100644 (file)
--- a/environment/pom.xml
+++ b/environment/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>environment</artifactId>

diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml
index 7587ef365e78d51fabd5bf6d08a2ca3a4cfc4165..7399c9aa3da3bdb26ceb1c5a060d0a1537b1709b 100644 (file)
--- a/knowledge/org.argeo.support.geonames/pom.xml
+++ b/knowledge/org.argeo.support.geonames/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.geonames</artifactId>

diff --git a/knowledge/org.argeo.support.odk/pom.xml b/knowledge/org.argeo.support.odk/pom.xml
index 2b6834770523505f5f2a2f59c5623230e345a163..d614048d4a6b710c70e919ca0ebce28d1e7da873 100644 (file)
--- a/knowledge/org.argeo.support.odk/pom.xml
+++ b/knowledge/org.argeo.support.odk/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.odk</artifactId>
@@ -14,12 +14,12 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml
index d97f8c72da9bd613416608275d26fed9f96eeb87..784189f977665a96f221b6fdb765342f830c3d07 100644 (file)
--- a/knowledge/org.argeo.support.xforms/pom.xml
+++ b/knowledge/org.argeo.support.xforms/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.xforms</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/knowledge/pom.xml b/knowledge/pom.xml
index 6a0890ef7d9008c6311bfd1223d455b6726fd02e..f6935d38cad30166a830feb59bdf697335c73fa2 100644 (file)
--- a/knowledge/pom.xml
+++ b/knowledge/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>knowledge</artifactId>

diff --git a/lib/pom.xml b/lib/pom.xml
index b3a10b9e617c68085c089b02a0653676fbc74876..77b25e473e09240e127108ffb2a21d26a7e441f1 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -10,15 +10,15 @@
        <packaging>pom</packaging>
        <name>Parent POM for Argeo Suite Extensions</name>
        <description />
-       <version>2.3.1-SNAPSHOT</version>
+       <version>2.1.21-SNAPSHOT</version>
        <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.3.1-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1.101</version.argeo-commons>
                <version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <dependencies>
@@ -30,7 +30,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                        <scope>provided</scope>
                        <exclusions>
                                <exclusion>
@@ -92,18 +92,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>
@@ -172,4 +160,8 @@
                        </plugin>
                </plugins>
        </reporting>
+
+  <scm>
+    <tag>v2.x</tag>
+  </scm>
 </project>

diff --git a/library/org.argeo.documents.ui/pom.xml b/library/org.argeo.documents.ui/pom.xml
index 2c59ff32c35c2039f502325a56a0236b1e862e47..d5cfbc3decccd747747dc51e44585c011b097dac 100644 (file)
--- a/library/org.argeo.documents.ui/pom.xml
+++ b/library/org.argeo.documents.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>library</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.documents.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/library/pom.xml b/library/pom.xml
index ea3ef63ea4395507d25c3de28695f60f2faebdf3..61247f32be5133d582f3124a31e8255df38a6f45 100644 (file)
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>library</artifactId>

diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml
index 07589a464c9a9b2b597a938ebde2d941b7aa28ee..dc8a10507f06b8f6a106adab15098c3884412a2f 100644 (file)
--- a/people/org.argeo.people.ui/pom.xml
+++ b/people/org.argeo.people.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>people</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.people.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/people/pom.xml b/people/pom.xml
index 193f6337c8dae04a8a1b1e1e623c195a6aec24f3..7d6acf27ca776fba51d7b03eb0ef6a41edc65781 100644 (file)
--- a/people/pom.xml
+++ b/people/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>people</artifactId>

diff --git a/pom.xml b/pom.xml
index d2872fe731983b3c55bcf16df42b9386bd1cadc3..6e960ea19913a0ad3c599d3823cb69210c7ca009 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,4 @@
-<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>
@@ -9,7 +7,7 @@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.3.1-SNAPSHOT</version>
+       <version>2.1.21-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
@@ -17,10 +15,10 @@
                <!-- 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.3.1-SNAPSHOT</version.argeo-commons>
-               <version.argeo-suite-icons>2.1.1-SNAPSHOT</version.argeo-suite-icons>
+               <version.argeo-commons>2.1.101</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>
@@ -41,7 +39,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>HEAD</tag>
+               <tag>v2.x</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@ -108,18 +106,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>
@@ -191,7 +177,7 @@
        <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>

diff --git a/publishing/org.argeo.publishing.ui/pom.xml b/publishing/org.argeo.publishing.ui/pom.xml
index b70057c7a7801c39d48a972083f31e0a13a58dd1..1b1f3f87acd1bbedfbfc8a4de689a9ab4562ed1a 100644 (file)
--- a/publishing/org.argeo.publishing.ui/pom.xml
+++ b/publishing/org.argeo.publishing.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>publishing</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.publishing.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.21-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/publishing/pom.xml b/publishing/pom.xml
index 5dfdd446d4e3f56c45ec8229f71b6136dcb246f7..0b4581ddd1da16821505ffb75500fd4cdfd570b8 100644 (file)
--- a/publishing/pom.xml
+++ b/publishing/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.21-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>publishing</artifactId>