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

diff --git a/.project b/.project
index 3fcd2fd54a7d1ed9902e9eac326fe6d0a2d25231..ff418936f2de03c4250f3d5a808862b33bc3faf5 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo-suite-unstable</name>
+       <name>argeo-suite</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/cnf/build.bnd b/cnf/build.bnd
index 38f5f286a6df0d08f9ac5298e4ee84bfbf7642ea..c59a50e14ae07b3336ef542075e1c5ca0149efee 100644 (file)
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,3 +1,3 @@
 -include: \
 ${workspace}/cnf/argeo.bnd, \
-${workspace}/cnf/unstable.bnd
+${workspace}/cnf/testing.bnd

diff --git a/cnf/maven.bnd b/cnf/maven.bnd
index f3a6e83cff694e34f205b57c12ac484b31039798..1b962bce97311a102a4164e0a5b5283186d12410 100644 (file)
--- a/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@ -1,3 +1,3 @@
 -include: \
 ../cnf/argeo.bnd, \
-../cnf/unstable.bnd
+../cnf/testing.bnd

diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644 (file)
index 0000000..b778569
--- /dev/null
+++ b/cnf/testing.bnd
@@ -0,0 +1,8 @@
+version.released=2.1.23
+qualifier=.next
+
+category=org.argeo.suite
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
+argeo.rpm.suffix=

diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index 43ad96f766ab47cb1593f33304141ffa19f7169f..f4238b8116c6757b1836dc2bc49df43e84ff6396 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-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 

diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
index b4c4229fbcab48674441b8aebc1618c802ed81dc..17b9ae3c78e9bd10c173abd3ce975ee197fd9a83 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rcp</artifactId>

diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index f52ecf192679eb87e1937e833897f1efb98132ed..1740dd37e4d899519064093c13d26b121da3920f 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-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@ -29,17 +29,17 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Suite Icons -->
@@ -53,67 +53,67 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.theme.default</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo People -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.people.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Library -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.library.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Environment -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.geo.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Publishing -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.publishing.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Knowledge -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.odk</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.geonames</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- PDFBox -->

diff --git a/dep/pom.xml b/dep/pom.xml
index 56956083495727e42225054df28eb3a7c5e7591e..d69eb9b2f01afce4b62f36c2de992a01a2799386 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-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>

diff --git a/dist/argeo-suite-standard/pom.xml b/dist/argeo-suite-standard/pom.xml
index 0b26e87588b66d6550175670e9dff5357418b8cf..23c524b65447cbdd1472abdc053f9ba0a6bb1548 100644 (file)
--- a/dist/argeo-suite-standard/pom.xml
+++ b/dist/argeo-suite-standard/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-suite-standard</artifactId>

diff --git a/dist/pom.xml b/dist/pom.xml
index 90ca6d2e221db8f71dd076ca46ccd39fe836dd5b..dae809c50097dde861c9d59045ba46f302a15b6e 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-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>

diff --git a/lib/pom.xml b/lib/pom.xml
index e00226e165f586f938cba3f4e1d5f8d8fcca9108..5611ecf11b2e956f9b8c0d22509d86ba806ad0a7 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -3,19 +3,20 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.6</version>
+               <version>2.1.3</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite-lib</artifactId>
        <packaging>pom</packaging>
        <name>Parent POM for Argeo Suite Extensions</name>
        <description />
-       <version>2.3-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <properties>
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
-               <version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
+               <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
+               <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
                <git.rw />
        </properties>
        <dependencies>
@@ -27,7 +28,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                        <exclusions>
                                <!-- Avoid slf4j implementations lurking in the classpath. -->
@@ -85,18 +86,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>

diff --git a/org.argeo.entity.api/pom.xml b/org.argeo.entity.api/pom.xml
index d20f3f60d63a2dee5da99f02d29897cfdb17ad59..c98575c8c57cc199bbfe0fc7fe14effcc70ae1a4 100644 (file)
--- a/org.argeo.entity.api/pom.xml
+++ b/org.argeo.entity.api/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.api</artifactId>

diff --git a/org.argeo.entity.core/pom.xml b/org.argeo.entity.core/pom.xml
index 090ce00d7cc79df377e82bbedcaefaac2d4c8dc8..a0509450235649551d0425768deb16c1e1a25102 100644 (file)
--- a/org.argeo.entity.core/pom.xml
+++ b/org.argeo.entity.core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/org.argeo.entity.ui/pom.xml b/org.argeo.entity.ui/pom.xml
index 10c591842eca281d3b67d87e88ee2c6ccbf16274..d53f0d005482a27facaa34eb74961147c9c10c93 100644 (file)
--- a/org.argeo.entity.ui/pom.xml
+++ b/org.argeo.entity.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/org.argeo.geo.ui/pom.xml b/org.argeo.geo.ui/pom.xml
index cfe3a0e6320ffac541c953ade3c21429384aafbb..5677817aaf9a90a131169ebe903aee18d4c8b28c 100644 (file)
--- a/org.argeo.geo.ui/pom.xml
+++ b/org.argeo.geo.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/org.argeo.library.ui/pom.xml b/org.argeo.library.ui/pom.xml
index 672634ad7d11b8af7bce5042c17069eaef68906a..c7a67a81c04ae7aba30454025e546bbedef1563c 100644 (file)
--- a/org.argeo.library.ui/pom.xml
+++ b/org.argeo.library.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.library.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/org.argeo.people.ui/pom.xml b/org.argeo.people.ui/pom.xml
index d211fc75d0c2d288f2488f38d105fbcc313b915e..30c8eb8dab6b45f4ead38b50894ac85f7bf3cf0f 100644 (file)
--- a/org.argeo.people.ui/pom.xml
+++ b/org.argeo.people.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/org.argeo.publishing.ui/pom.xml b/org.argeo.publishing.ui/pom.xml
index f26aeb4391f2e230affba435e1d04bc1a8013a15..59618338c5d38c1fb800d0db84c1a70b4c244a46 100644 (file)
--- a/org.argeo.publishing.ui/pom.xml
+++ b/org.argeo.publishing.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/org.argeo.suite.core/pom.xml b/org.argeo.suite.core/pom.xml
index e7402fc5594e583925a3a3ca61ca30d489ed57e2..b0750446a57e572de86d421f7d6e9a2d759d87cd 100644 (file)
--- a/org.argeo.suite.core/pom.xml
+++ b/org.argeo.suite.core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/org.argeo.suite.theme.default/pom.xml b/org.argeo.suite.theme.default/pom.xml
index f2927dc84fbb0f99ad4d12522772d774f27c040a..be49f36d486ff136e7124fbe60b96faeb965f913 100644 (file)
--- a/org.argeo.suite.theme.default/pom.xml
+++ b/org.argeo.suite.theme.default/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.theme.default</artifactId>

diff --git a/org.argeo.suite.ui.rap/pom.xml b/org.argeo.suite.ui.rap/pom.xml
index f1f2d8326c34a90cae0311f6319d68da8bdd5c3b..837a369e3ce8eb7897b41559eb2190d4d55708a7 100644 (file)
--- a/org.argeo.suite.ui.rap/pom.xml
+++ b/org.argeo.suite.ui.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/org.argeo.suite.ui/pom.xml b/org.argeo.suite.ui/pom.xml
index b5d1b2ae792abf6ead6b81167f0fd032bbb57cb0..54b6b6ff99039e60de59c9a8356ce082ed526211 100644 (file)
--- a/org.argeo.suite.ui/pom.xml
+++ b/org.argeo.suite.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/org.argeo.support.geonames/pom.xml b/org.argeo.support.geonames/pom.xml
index ce70b50e19248b28c05edb658e4e91291acf4d6f..3a1e5f3a1a4e6d154fadaf3f285875292117e0a2 100644 (file)
--- a/org.argeo.support.geonames/pom.xml
+++ b/org.argeo.support.geonames/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.geonames</artifactId>

diff --git a/org.argeo.support.odk/pom.xml b/org.argeo.support.odk/pom.xml
index 2f97176c4b1c18c891e2e2e2d1db74ae53082566..0379dd45e850f4a89379565d5b56f24a29c1fde0 100644 (file)
--- a/org.argeo.support.odk/pom.xml
+++ b/org.argeo.support.odk/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/org.argeo.support.xforms/pom.xml b/org.argeo.support.xforms/pom.xml
index 08149b13b9a258c9c87be008ff6d349e779b4866..9d593144279805078e037eda69f9ee8c1f5a3f6f 100644 (file)
--- a/org.argeo.support.xforms/pom.xml
+++ b/org.argeo.support.xforms/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-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-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 5e094f23fe7988945ee5ec11fb8523010678b838..b6dd2377acef44792af1bdf5c9fa7463dc1c2bb5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,17 +7,17 @@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.3-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
-               <version.context>unstable</version.context>
+               <version.context>testing</version.context>
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
-               <version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
-               <!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
+               <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
+               <!-- <version.argeo-rcp>2.1-SNAPSHOT</version.argeo-rcp> -->
                <git.rw />
        </properties>
        <modules>
@@ -117,18 +117,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>
@@ -200,12 +188,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-suite/</url>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>
                </site>
        </distributionManagement>
 </project>