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

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

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

diff --git a/demo/pom.xml b/demo/pom.xml
index f152523a12d82e72fb05ee725787d19b8607521e..22d23f847fffca7b6bcf729faf1c068cc105f1b3 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>demo</artifactId>
@@ -20,7 +20,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>
@@ -42,7 +42,7 @@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.3-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                </profile>
@@ -64,7 +64,7 @@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.3-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                </profile>

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 423b9b32cfe55e6d8542de183b4e236d82d9ca06..d1eca2f86ae0aa7ce9fc9f1cf44c1aec81594725 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,17 +15,17 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Third Parties -->
@@ -234,7 +234,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>

diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml
index 7cdd09255e55f411ae618c0f76344f686d0e5f97..23e185216caedc4a05d4241cdf34624acdaa74cc 100644 (file)
--- a/dep/org.argeo.dep.cms.e4.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
@@ -23,12 +23,12 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SVG and CSS -->

diff --git a/dep/org.argeo.dep.cms.ext/pom.xml b/dep/org.argeo.dep.cms.ext/pom.xml
index af26bb8c79ddeefe0b05e3edcd70cd895b35e8fa..904349332edd716b7d1416014c41ff7a8081b3aa 100644 (file)
--- a/dep/org.argeo.dep.cms.ext/pom.xml
+++ b/dep/org.argeo.dep.cms.ext/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index f88a1ded9599ea049724550c0776ab85f23810d4..8dc2dd55abdc9b958857058ac5eb991194e6b56e 100644 (file)
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
@@ -23,17 +23,17 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.maintenance</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- CMS Dependencies -->

diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml
index bf645715dc5de4903e9ee515460cf44ee47cb82f..93ab967ec5dc603f27476159063ab25fded85b7d 100644 (file)
--- a/dep/org.argeo.dep.cms.ui.rap/pom.xml
+++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
@@ -49,27 +49,27 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SDK -->

diff --git a/dep/pom.xml b/dep/pom.xml
index 028b83b658340cf9a0ac2a805e2d37f4751cb69d..b83b2886b429a50a57726759c0a61aa36b7e62db 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
@@ -118,7 +118,7 @@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
-                                       <version>2.3-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                        <scope>test</scope>
                                </dependency>
                        </dependencies>

diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml
index 73c11bf92e2686048c62f5558b4849a57f58e9bb..d04ba5696ff96ba81eb022ce8137d2f42d655f71 100644 (file)
--- a/dist/argeo-cli/pom.xml
+++ b/dist/argeo-cli/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -16,12 +16,12 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>

diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml
index c066a64817056df9d6e62326e0428a07960e2fec..9a6d616b4dfecd59d431f0b34e404807d159a140 100644 (file)
--- a/dist/argeo-node/pom.xml
+++ b/dist/argeo-node/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -16,23 +16,23 @@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.client</artifactId>
-                                       <version>2.3-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.node</artifactId>
-                                       <version>2.3-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.dep.cms.e4.rap</artifactId>
-                                       <version>2.3-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>osgi-boot</artifactId>
                                        <type>zip</type>
-                                       <version>2.3-SNAPSHOT</version>
+                                       <version>2.1-SNAPSHOT</version>
                                </dependency>
                        </dependencies>
                        <build>

diff --git a/dist/containers/pom.xml b/dist/containers/pom.xml
index 2c7f6bfcc1925ccc0eccab14936a5d795232d713..cc3242537032469469397fbaac2a5aa44afa81f9 100644 (file)
--- a/dist/containers/pom.xml
+++ b/dist/containers/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>

diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml
index 0217100889513ef12e443788291cc037733a19a4..575b4b4f81709e465ae86987b2801114232ea996 100644 (file)
--- a/dist/osgi-boot/pom.xml
+++ b/dist/osgi-boot/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>dist</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -23,7 +23,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
        <profiles>

diff --git a/dist/pom.xml b/dist/pom.xml
index 7e0e208209233f55df39ec2f253fc62e2e39d9e9..f6b9917e090e3f1e61426c1c681ee12f13b91b1a 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>

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

diff --git a/org.argeo.cms.e4.rap/pom.xml b/org.argeo.cms.e4.rap/pom.xml
index 7f5269876e709b34d6175bad0fd68c50c617e878..81f2fcacc470be9fefedd7a37659f60728a814b8 100644 (file)
--- a/org.argeo.cms.e4.rap/pom.xml
+++ b/org.argeo.cms.e4.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.e4.rap</artifactId>
@@ -14,18 +14,18 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.e4</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
 

diff --git a/org.argeo.cms.e4/pom.xml b/org.argeo.cms.e4/pom.xml
index ae12564c5613b8dcf7b401373577e9b7c67a436d..fd1842afd33420104cb604d04ffebe49225ab969 100644 (file)
--- a/org.argeo.cms.e4/pom.xml
+++ b/org.argeo.cms.e4/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.e4</artifactId>
@@ -14,14 +14,14 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>

diff --git a/org.argeo.cms.ui.rap/pom.xml b/org.argeo.cms.ui.rap/pom.xml
index b38871cc29d98e6a7fdb6cbfc9a524b825222c8e..37fdd9a174206488bdd9b6c06f5c2ef2d0e207d4 100644 (file)
--- a/org.argeo.cms.ui.rap/pom.xml
+++ b/org.argeo.cms.ui.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui.rap</artifactId>
@@ -14,13 +14,13 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -28,7 +28,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->

diff --git a/org.argeo.cms.ui.theme/pom.xml b/org.argeo.cms.ui.theme/pom.xml
index be47b820a561b67cdf53fd640e241f12751a1e87..b30460a81a0f79b01dfd8f6fd789366d33c68035 100644 (file)
--- a/org.argeo.cms.ui.theme/pom.xml
+++ b/org.argeo.cms.ui.theme/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui.theme</artifactId>

diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml
index 60eb6203f9465022a5d629881c95213c1d08033f..186bb1e5b3c6b9e56f7742d1a65c449a44035068 100644 (file)
--- a/org.argeo.cms.ui/pom.xml
+++ b/org.argeo.cms.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.ui</artifactId>
@@ -14,13 +14,13 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- Specific -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -28,7 +28,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.theme</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->

diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml
index e19f92e01ea955b1e6bd3643cff5a18294e4553d..45aaa917ef8dbed92845eddd1386abfd486e8638 100644 (file)
--- a/org.argeo.cms/pom.xml
+++ b/org.argeo.cms/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms</artifactId>
@@ -14,27 +14,27 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.maintenance</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml
index 37d89574d4b423eaf9e0d19c5bd0343b7c71910b..b1dfe92c6d6072eac280f73fe11404fd8fef7e0b 100644 (file)
--- a/org.argeo.core/pom.xml
+++ b/org.argeo.core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.core</artifactId>
@@ -13,12 +13,12 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index 8b728c16cf41f800efe3e0627b7d8cf28c4cf8b6..e56d4395bfea8e9cdfa0214624e4cc1f645bc1d6 100644 (file)
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -13,7 +13,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->

diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index 1574da881d436790acc910e4442a348608df7f90..e3069dd374f7f6ac6618d4144f859f69d3175dd4 100644 (file)
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -18,7 +18,7 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- UI -->

diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml
index 7a3677206db0ad3e8c9f612e5bb8775c79c1a45b..fef408449f533085cf6cf13de394f9cebb6070b4 100644 (file)
--- a/org.argeo.enterprise/pom.xml
+++ b/org.argeo.enterprise/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.enterprise</artifactId>

diff --git a/org.argeo.jcr/pom.xml b/org.argeo.jcr/pom.xml
index d8d74920faef20520cf946e05c4b22e09d6fef5e..99becb52ea352f39bd3134682c200b4a96e67c6a 100644 (file)
--- a/org.argeo.jcr/pom.xml
+++ b/org.argeo.jcr/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.jcr</artifactId>

diff --git a/org.argeo.maintenance/pom.xml b/org.argeo.maintenance/pom.xml
index b33e47dfc2fedc45202a68cdaef0923deb091a2f..b061f87cdaed55e12f343bc068a5d4dfd810f285 100644 (file)
--- a/org.argeo.maintenance/pom.xml
+++ b/org.argeo.maintenance/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.maintenance</artifactId>
@@ -14,22 +14,22 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.enterprise</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.core</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml
index 33a858d3a3bdfde40cd15d3a1ce961b56e5d6804..1bf95002e90ca582be34b0c0bf1c6fde34353e89 100644 (file)
--- a/org.argeo.osgi.boot/pom.xml
+++ b/org.argeo.osgi.boot/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <artifactId>argeo-commons</artifactId>
                <relativePath>..</relativePath>
        </parent>

diff --git a/pom.xml b/pom.xml
index 143a3ea5a449d360d24180871673dae761580401..fb1bedf58c490e66eb7f632c5bcd090146f4d8da 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,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>
@@ -119,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>
@@ -140,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>

diff --git a/sdk/pom.xml b/sdk/pom.xml
index 54bcb222b201c7fb51a2ab3196ed8e66fa8c1e71..9631f6acd6ad84fee638c96e8d4c11b2f07fe53a 100644 (file)
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>sdk</artifactId>