Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 7 Feb 2021 12:14:15 +0000 (13:14 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 7 Feb 2021 12:14:15 +0000 (13:14 +0100)
28 files changed:
core/org.argeo.entity.api/pom.xml
core/org.argeo.entity.core/pom.xml
core/org.argeo.entity.ui/pom.xml
core/org.argeo.suite.core/pom.xml
core/org.argeo.suite.theme.default/pom.xml
core/org.argeo.suite.ui.rap/pom.xml
core/org.argeo.suite.ui/pom.xml
core/pom.xml
dep/org.argeo.suite.dep.e4.rap/pom.xml
dep/org.argeo.suite.dep.ui.rap/pom.xml
dep/pom.xml
dist/argeo-office/pom.xml
dist/argeo-suite-demo/pom.xml
dist/pom.xml
environment/org.argeo.geo.ui/pom.xml
environment/pom.xml
knowledge/org.argeo.support.geonames/pom.xml
knowledge/org.argeo.support.odk/pom.xml
knowledge/org.argeo.support.xforms/pom.xml
knowledge/pom.xml
lib/pom.xml
library/org.argeo.documents.ui/pom.xml
library/pom.xml
people/org.argeo.people.ui/pom.xml
people/pom.xml
pom.xml
publishing/org.argeo.publishing.ui/pom.xml
publishing/pom.xml

index c0723fe8414d98fa6787f767005293bb1e3bbab9..ed4ab92d9cb4b0db3fb80d5e3e5cbd0b394f73ac 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.api</artifactId>
index 39b697e72ea132c5bff5fd50249f947f41f11d70..fdc2954e1fd8895ed8f6516cca77bd55ec909c39 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->
index d635fbf8664096d7c4b00ed3a490b26239b8844a..e10fe14fb883fd2429a21de2b9f5d85fd89b19bd 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->
index 0c1d40bef094797c77183662f63583cbd19f02d2..3ae4e8b9e13fc86f35655e1093f8f708c41ed83d 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->
index e9f009237426d36f0d6d0c0d88f9b731c058a992..a96e81f7a719c9821c566cc50d057b84cbf801c6 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.theme.default</artifactId>
index a8a1e80bef085bf917230586a029dd8af1b01770..1c667d495d3d4bc71b5da5a520444fb5077dbf9a 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->
index 2436864320daf359a1f7f1879b4515fbfbefe05f..2ba2369674de658a49c76afc9ccc58ce95dbac40 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.ui</artifactId>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->
index a8ef5a0355662cf19ca29d2b89c61e221aa17c93..6b1affc00b24c00c76e77e7eb1cb86a6f0d03271 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>core</artifactId>
index 30ff3b6bea805afe043965317b45ee180d047dc8..f8533708c9e3773087d6e7b1d785088b63118ba8 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
index d8012360f5bcd2a2e67aee0025be2f2b2b05bb24..bf17de320e78d94083ead7465a0ff0d75c3939e8 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Suite -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-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.19-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.19-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.19-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.19-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.19-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.19-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.19-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.odk</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.geonames</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Additional Third Parties -->
index 60dc03490ecca4a50f22501d700131fbfc721d10..192d3f1a8d0d1ff0088467d9210c28a2fe6dd9e6 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
index dc4c578342dd7de45cc195f3cb347fb210ea40ca..cead30abd38908676710abab3c319743ee3bc7a4 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
index c31fc7dedb6a8fb60fa3b433b534b5f6706997ae..03e821dda36c290101289aa89505561574c4b6c8 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-suite-demo</artifactId>
index 38c2521bfd38c7e756b3b4dcecfc43e3860f4a44..387c4dc371634002c4c266eb39610a457de69cc1 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>
index a5a4711db8257aad207f5721336fb343ada01c34..e50e7c3057ed0658e131ed687a3da913bd57cdd0 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>environment</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->
index 7e13702d56a5fca8f60e97d81431bdb927448625..592711769afa70d0414d224f77706697621c5527 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>environment</artifactId>
index 7587ef365e78d51fabd5bf6d08a2ca3a4cfc4165..00c5ea49492a7756c76d9d6fb6cb78066e8d3bb6 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.geonames</artifactId>
index 2b6834770523505f5f2a2f59c5623230e345a163..49e1fdaa67c420f8f118571bdab1f2a047ace80d 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.odk</artifactId>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
index d97f8c72da9bd613416608275d26fed9f96eeb87..680451cbb2637a2f49b5d6a63c855dbbac452096 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
index 6a0890ef7d9008c6311bfd1223d455b6726fd02e..3db90ece965a9ae3f68cfb536823c4fe00729b4e 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>knowledge</artifactId>
index 259743612939fdf7457547815e0e2936401747f5..8713ec1fc10d1874181d3cf664347075238aac81 100644 (file)
        <packaging>pom</packaging>
        <name>Parent POM for Argeo Suite Extensions</name>
        <description />
-       <version>2.3.1-SNAPSHOT</version>
+       <version>2.1.19-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-SNAPSHOT</version.argeo-commons>
 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <dependencies>
@@ -29,7 +29,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.3.1-SNAPSHOT</version>
+                       <version>2.1.19-SNAPSHOT</version>
                        <scope>provided</scope>
                        <exclusions>
                                <exclusion>
                                <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>
                        </plugin>
                </plugins>
        </reporting>
+
+  <scm>
+    <tag>v2.x</tag>
+  </scm>
 </project>
index 2c59ff32c35c2039f502325a56a0236b1e862e47..a611a6de66f9df765127a7568dc4f7857abc77f4 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>library</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->
index ea3ef63ea4395507d25c3de28695f60f2faebdf3..fcd4e83c72793c1e9ade6607ac6ddf75c7d096c5 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>library</artifactId>
index 07589a464c9a9b2b597a938ebde2d941b7aa28ee..9cd983383842e72d95b5a27b7293b3c1526cb1d7 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>people</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->
index 193f6337c8dae04a8a1b1e1e623c195a6aec24f3..6839d7bbf009d32dcfc73f831905c86a81262600 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>people</artifactId>
diff --git a/pom.xml b/pom.xml
index 7626c1c6976d5356af9876ecf0d1b0e2ef099cb3..fcb8d3dfabd1ce17b1d2d1d2db56b1e244c5b5e3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.3.1-SNAPSHOT</version>
+       <version>2.1.19-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
@@ -17,9 +17,9 @@
                <!-- 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-SNAPSHOT</version.argeo-commons>
 
-               <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>
@@ -40,7 +40,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>
                                <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>
        <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>
index b70057c7a7801c39d48a972083f31e0a13a58dd1..13ff94252fbbc50a516e9c339a20f33b0c802181 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>publishing</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-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.19-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->
index 5dfdd446d4e3f56c45ec8229f71b6136dcb246f7..3ac25f6a9127ac5f4312c12e5074ceedb3c686aa 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.1-SNAPSHOT</version>
+               <version>2.1.19-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>publishing</artifactId>