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

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

diff --git a/cms/org.argeo.cms.integration/pom.xml b/cms/org.argeo.cms.integration/pom.xml
index d1b1080c056c459db3eecb8612da919c24d0f9a8..7c9ad7e4e509aa94849c458f86c375e28838cfb7 100644 (file)
--- a/cms/org.argeo.cms.integration/pom.xml
+++ b/cms/org.argeo.cms.integration/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.integration</artifactId>

diff --git a/cms/org.argeo.ext.equinox.jetty/pom.xml b/cms/org.argeo.ext.equinox.jetty/pom.xml
index 031e55c85915ff51c3df7374001e088dd76d9d74..733200a0e1f836616d08760d92267a9f3b9fcce7 100644 (file)
--- a/cms/org.argeo.ext.equinox.jetty/pom.xml
+++ b/cms/org.argeo.ext.equinox.jetty/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.ext.equinox.jetty</artifactId>

diff --git a/cms/pom.xml b/cms/pom.xml
index 4d0b53387862d71b9f2668dd65b05b7f392c0d7e..c8c4c64a5539d357d4fb53d24b3f07cd2f710bdf 100644 (file)
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -5,12 +5,12 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
        </parent>
        <artifactId>argeo-slc-cms</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC CMS</name>
-       <version>2.3-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <modules>
                <!-- Argeo CMS extensions -->
                <module>org.argeo.cms.integration</module>

diff --git a/cnf/build.bnd b/cnf/build.bnd
index af9c91be7d16ae6c7acaec7b6fc6bf73060d539f..f39af41a12594bcbdb0e07b1236505549564026b 100644 (file)
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,4 +1,4 @@
 -include: \
-${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/testing.bnd, \
 ${workspace}/cnf/argeo.bnd, \
 -${workspace}/cnf/release.bnd

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

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

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index b533a069ec92d82ae4c2a0bdbb8d6762e32d4976..686ce6b8af9723d53dcd12b2b2f3a60e5b6aeaaf 100644 (file)
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.e4.rap</artifactId>
@@ -19,7 +19,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 276d1fa08d82face21a827eef8c00835c94025df..d0918bd1b2b477399dbda71d134798f0fc51ed32 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.minimal</artifactId>
@@ -29,41 +29,41 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.runtime</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- SLC Repo -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.factory</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- CMS extensions -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.cms.integration</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.ext.equinox.jetty</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- CLI Agent -->

diff --git a/dep/pom.xml b/dep/pom.xml
index c463f27cdfe7e1ed4ea1e047324461938acab394..9938793222653646f0d8d6926485ad3a26c18e60 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>

diff --git a/ide/features/pom.xml b/ide/features/pom.xml
index 9e300ff2b59debd76c340a0ddd9907a0ff92cb34..39d0d730cbbe8b602a4f06dc00e8edeec82fdb4a 100644 (file)
--- a/ide/features/pom.xml
+++ b/ide/features/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc.ide</groupId>
                <artifactId>argeo-ide</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>features</artifactId>

diff --git a/ide/plugins/pom.xml b/ide/plugins/pom.xml
index 77945342af29e6cae944f857db9a7f02c7796896..05e4066cc59278c75939d4758305b3c8a93f1ec4 100644 (file)
--- a/ide/plugins/pom.xml
+++ b/ide/plugins/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc.ide</groupId>
                <artifactId>argeo-ide</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>plugins</artifactId>

diff --git a/ide/pom.xml b/ide/pom.xml
index 1a94bc6af36cc1c415a45afe0515d9292d904348..f51a7ad5494b8d206877181792798f816044aba0 100644 (file)
--- a/ide/pom.xml
+++ b/ide/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.ide</groupId>

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

diff --git a/legacy/dep/org.argeo.slc.dep.backend/pom.xml b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
index 0e6de0980b3199cbefb27a8b5254ff94ee5bfc3c..7eab2fa85d35525b71b5dee3526089e686432e91 100644 (file)
--- a/legacy/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy-dep</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.backend</artifactId>
@@ -13,7 +13,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.spring</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
@@ -33,13 +33,13 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.support</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.server.repo</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <!-- <dependency> -->
                <!-- <groupId>org.argeo.slc</groupId> -->
@@ -51,17 +51,17 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.client.ui</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.client.ui.dist</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.client.rap</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- OSGi Boot for platform generation only, as it could be used by regular 

diff --git a/legacy/dep/org.argeo.slc.dep.spring/pom.xml b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
index e0bb73d26d53fa6b465e71bcc37a26f5e8c69f3f..2ea8ecee4598709c4802f37f8d382481f472eb7b 100644 (file)
--- a/legacy/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.spring/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy-dep</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.spring</artifactId>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 
@@ -23,22 +23,22 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.spring</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.support</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.agent</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.agent.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Transitional fake Java 8 APIs, required by old version of Spring, 
@@ -46,7 +46,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.legacy.fake.java8</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Not strictly Spring dependencies but used by the old approach -->

diff --git a/legacy/dep/pom.xml b/legacy/dep/pom.xml
index affcea4a4677cb8541e6227f0c40964e4308a7c6..7386dc7ec7095e8359ff99f0f64854ceff4387c4 100644 (file)
--- a/legacy/dep/pom.xml
+++ b/legacy/dep/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>legacy-dep</artifactId>

diff --git a/legacy/lib/pom.xml b/legacy/lib/pom.xml
index c24dbfabc602a95e1dadd5bd1d2336b580be85d5..6b1e3de486199596d7b8b504ce1016fd57858ad4 100644 (file)
--- a/legacy/lib/pom.xml
+++ b/legacy/lib/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>lib</artifactId>
@@ -54,7 +54,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
        </dependencies>

diff --git a/legacy/org.argeo.legacy.fake.java8/pom.xml b/legacy/org.argeo.legacy.fake.java8/pom.xml
index 4f99e712f5400c0e57c960fa11d78b2c820775a1..d0a7a7076e89b5186fc4ff0f50c73dd39447efeb 100644 (file)
--- a/legacy/org.argeo.legacy.fake.java8/pom.xml
+++ b/legacy/org.argeo.legacy.fake.java8/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.legacy.fake.java8</artifactId>

diff --git a/legacy/org.argeo.slc.agent.jcr/pom.xml b/legacy/org.argeo.slc.agent.jcr/pom.xml
index 437754af959107c388f74786fa94647db5f236b4..807cf654444579760d12b4c5eee1fcc9eb6de054 100644 (file)
--- a/legacy/org.argeo.slc.agent.jcr/pom.xml
+++ b/legacy/org.argeo.slc.agent.jcr/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.agent.jcr</artifactId>

diff --git a/legacy/org.argeo.slc.agent/pom.xml b/legacy/org.argeo.slc.agent/pom.xml
index fbf41ceffd7e5f8534ef50b55154ba406cbc3d49..2e4bea6942b368c43010154bdc03ff1a3c7c5375 100644 (file)
--- a/legacy/org.argeo.slc.agent/pom.xml
+++ b/legacy/org.argeo.slc.agent/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.agent</artifactId>

diff --git a/legacy/org.argeo.slc.client.rap/pom.xml b/legacy/org.argeo.slc.client.rap/pom.xml
index c1decab151f27243636229f3ee7c3d66a286a853..c498506f050ec402835b684496958222be76a297 100644 (file)
--- a/legacy/org.argeo.slc.client.rap/pom.xml
+++ b/legacy/org.argeo.slc.client.rap/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.client.rap</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo common distribution for Secured UI -->

diff --git a/legacy/org.argeo.slc.client.ui.dist/pom.xml b/legacy/org.argeo.slc.client.ui.dist/pom.xml
index 81c5c8d611dd552f8d3c34adb4f0ee013d13321b..4987819878e2d17d6edbf588cb7f4aa0b970a21a 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/pom.xml
+++ b/legacy/org.argeo.slc.client.ui.dist/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.client.ui.dist</artifactId>
@@ -28,22 +28,22 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.spring</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.server.repo</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Base dependencies -->

diff --git a/legacy/org.argeo.slc.client.ui/pom.xml b/legacy/org.argeo.slc.client.ui/pom.xml
index 6fe69c8ebb4ca182485bdd21dfde158367cf2414..454dedf726dbb1d5f2318b85dc9ab62190485a76 100644 (file)
--- a/legacy/org.argeo.slc.client.ui/pom.xml
+++ b/legacy/org.argeo.slc.client.ui/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.client.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.spring</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/legacy/org.argeo.slc.demo.ant/pom.xml b/legacy/org.argeo.slc.demo.ant/pom.xml
index caabffa8e5c7aac6908667e5db3b8d0b40100650..7107a5beeedcc33c4fc6a18101382d2bcbb0fab3 100644 (file)
--- a/legacy/org.argeo.slc.demo.ant/pom.xml
+++ b/legacy/org.argeo.slc.demo.ant/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>lib</relativePath>
        </parent>
        <artifactId>org.argeo.slc.demo.ant</artifactId>

diff --git a/legacy/org.argeo.slc.demo.basic/pom.xml b/legacy/org.argeo.slc.demo.basic/pom.xml
index e900aab4bc7affac89c81fee1a2fc8b0930a1010..f4fe2cff496b4a3db16f6a41dfe99e5d9f628852 100644 (file)
--- a/legacy/org.argeo.slc.demo.basic/pom.xml
+++ b/legacy/org.argeo.slc.demo.basic/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>lib</relativePath>
        </parent>
        <artifactId>org.argeo.slc.demo.basic</artifactId>

diff --git a/legacy/org.argeo.slc.demo.minimal/pom.xml b/legacy/org.argeo.slc.demo.minimal/pom.xml
index 2c189128b510899c67c96b6be7bd22b95e81d05d..09631dab53567ca336397db077cee8497fbfa3fa 100644 (file)
--- a/legacy/org.argeo.slc.demo.minimal/pom.xml
+++ b/legacy/org.argeo.slc.demo.minimal/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>lib</relativePath>
        </parent>
        <artifactId>org.argeo.slc.demo.minimal</artifactId>

diff --git a/legacy/org.argeo.slc.launcher/pom.xml b/legacy/org.argeo.slc.launcher/pom.xml
index c073f604c7dd9d61995bb8e8bb1e1dc7fd781b33..18bd6cca885fc8c0f623851ed390a305c860c4bd 100644 (file)
--- a/legacy/org.argeo.slc.launcher/pom.xml
+++ b/legacy/org.argeo.slc.launcher/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.launcher</artifactId>

diff --git a/legacy/org.argeo.slc.server.repo/pom.xml b/legacy/org.argeo.slc.server.repo/pom.xml
index a34ec7041838c34445770976aec09ca33a2b621c..95f8827d002e7d7eff7f19b13ebe1b6924bdf4f7 100644 (file)
--- a/legacy/org.argeo.slc.server.repo/pom.xml
+++ b/legacy/org.argeo.slc.server.repo/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.server.repo</artifactId>

diff --git a/legacy/org.argeo.slc.spring/pom.xml b/legacy/org.argeo.slc.spring/pom.xml
index fc025e6d6ab081c3d175ef686b6cb968155c117b..13e8f907a1154da4f3b469d4a5819856a3dfc3b4 100644 (file)
--- a/legacy/org.argeo.slc.spring/pom.xml
+++ b/legacy/org.argeo.slc.spring/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.spring</artifactId>
@@ -43,17 +43,17 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.jcr</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Spring -->

diff --git a/legacy/org.argeo.slc.support/pom.xml b/legacy/org.argeo.slc.support/pom.xml
index 06f048d7e5d1832eb6f82e129d235722e0b424e3..52008065df99a969b1108222bc4a1a4400a9b710 100644 (file)
--- a/legacy/org.argeo.slc.support/pom.xml
+++ b/legacy/org.argeo.slc.support/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.support</artifactId>
@@ -13,12 +13,12 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.runtime</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.spring</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/legacy/pom.xml b/legacy/pom.xml
index 23ccdaa4163d04e9ce3ad2d024e0c2cae2d35951..682bea9c32e96ff35a9554e399cd9b94b6457a4e 100644 (file)
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>legacy</artifactId>
-       <version>2.3-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>SLC Legacy Argeo Software</name>
        <properties>

diff --git a/org.argeo.slc.api/pom.xml b/org.argeo.slc.api/pom.xml
index f943ccce0e412a384f97608b9ef44ce617abca34..c8f3ae2ab21d24dfe8ba490d4f777ccb5c20b5da 100644 (file)
--- a/org.argeo.slc.api/pom.xml
+++ b/org.argeo.slc.api/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.api</artifactId>

diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.factory/pom.xml
index dadb1c73af6948c5e1168283e1c9cbba268c036b..0b5c4ed265c0d98d2862fd550fccb9a79ac1afcc 100644 (file)
--- a/org.argeo.slc.factory/pom.xml
+++ b/org.argeo.slc.factory/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.factory</artifactId>
@@ -13,12 +13,12 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.runtime</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.repo</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.slc.jcr/pom.xml b/org.argeo.slc.jcr/pom.xml
index 0212f04db88c5ddc1f0656f1ba9861f5a289dfd4..b525c28186e94f067b512b77d19ac48117c927fc 100644 (file)
--- a/org.argeo.slc.jcr/pom.xml
+++ b/org.argeo.slc.jcr/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.jcr</artifactId>
@@ -13,12 +13,12 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.runtime</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Commons -->

diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml
index 200b1161e792e619d50aed3e1f4319d5732d0872..155214ecf10feccec6d05619c887241ec1f92cfc 100644 (file)
--- a/org.argeo.slc.repo/pom.xml
+++ b/org.argeo.slc.repo/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.repo</artifactId>
@@ -13,7 +13,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Commons -->

diff --git a/org.argeo.slc.runtime/pom.xml b/org.argeo.slc.runtime/pom.xml
index 0c3283969d41b3be98ebc8ac9f4789888e52cde1..a9bf496f05a957c86348a1cae7bf13c4d3ba1e70 100644 (file)
--- a/org.argeo.slc.runtime/pom.xml
+++ b/org.argeo.slc.runtime/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.3-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.runtime</artifactId>
@@ -13,7 +13,7 @@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
-                       <version>2.3-SNAPSHOT</version>
+                       <version>2.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 8a27ddd420bbd90e4675a8f9fbf141498ad29b2a..661b19441c5e571ba67898ce0db3eb21a4bd3001 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,15 +9,15 @@
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <version>2.3-SNAPSHOT</version>
+       <version>2.1-SNAPSHOT</version>
        <properties>
-               <version.context>unstable</version.context>
+               <version.context>testing</version.context>
                <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-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 
                <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-               <developmentCycle.slc>2.3</developmentCycle.slc>
+               <developmentCycle.slc>2.1</developmentCycle.slc>
                <version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
        </properties>
        <modules>
@@ -129,18 +129,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>
@@ -156,7 +144,7 @@
        <distributionManagement>
                <site>
                        <id>staging</id>
-                       <url>file:///srv/docfactory/argeo-2.3/site/argeo-slc/</url>
+                       <url>file:///srv/docfactory/argeo-2.1/site/argeo-slc/</url>
                </site>
        </distributionManagement>
        <profiles>
@@ -165,7 +153,7 @@
                        <repositories>
                                <repository>
                                        <id>argeo-extras</id>
-                                       <url>http://localhost:7080/data/java/argeo-extras-2.3</url>
+                                       <url>http://localhost:7080/data/java/argeo-extras-2.1</url>
                                        <releases>
                                                <enabled>true</enabled>
                                                <updatePolicy>daily</updatePolicy>