Merge remote-tracking branch 'origin/master' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 16 Nov 2021 08:05:29 +0000 (09:05 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 16 Nov 2021 08:05:29 +0000 (09:05 +0100)
38 files changed:
1  2 
.project
cms/org.argeo.cms.integration/pom.xml
cms/org.argeo.ext.equinox.jetty/pom.xml
cms/pom.xml
cnf/build.bnd
cnf/maven.bnd
cnf/testing.bnd
dep/org.argeo.slc.dep.e4.rap/pom.xml
dep/org.argeo.slc.dep.minimal/pom.xml
dep/pom.xml
ide/features/pom.xml
ide/plugins/pom.xml
ide/pom.xml
legacy/argeo-commons/pom.xml
legacy/dep/org.argeo.slc.dep.backend/pom.xml
legacy/dep/org.argeo.slc.dep.spring/pom.xml
legacy/dep/pom.xml
legacy/lib/pom.xml
legacy/org.argeo.legacy.fake.java8/pom.xml
legacy/org.argeo.slc.agent.jcr/pom.xml
legacy/org.argeo.slc.agent/pom.xml
legacy/org.argeo.slc.client.rap/pom.xml
legacy/org.argeo.slc.client.ui.dist/pom.xml
legacy/org.argeo.slc.client.ui/pom.xml
legacy/org.argeo.slc.demo.ant/pom.xml
legacy/org.argeo.slc.demo.basic/pom.xml
legacy/org.argeo.slc.demo.minimal/pom.xml
legacy/org.argeo.slc.launcher/pom.xml
legacy/org.argeo.slc.server.repo/pom.xml
legacy/org.argeo.slc.spring/pom.xml
legacy/org.argeo.slc.support/pom.xml
legacy/pom.xml
org.argeo.slc.api/pom.xml
org.argeo.slc.factory/pom.xml
org.argeo.slc.jcr/pom.xml
org.argeo.slc.repo/pom.xml
org.argeo.slc.runtime/pom.xml
pom.xml

diff --cc .project
Simple merge
index 633f4c05e7e2f3f3a712497d6c318dfc8ca95564,d1b1080c056c459db3eecb8612da919c24d0f9a8..7c9ad7e4e509aa94849c458f86c375e28838cfb7
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.cms.integration</artifactId>
index 238efab6880e5432553b81217f6573d19ed22a82,031e55c85915ff51c3df7374001e088dd76d9d74..733200a0e1f836616d08760d92267a9f3b9fcce7
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-cms</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.ext.equinox.jetty</artifactId>
diff --cc cms/pom.xml
index fbd40ce19703d7e820642fb048381b3702a13ea7,4d0b53387862d71b9f2668dd65b05b7f392c0d7e..c8c4c64a5539d357d4fb53d24b3f07cd2f710bdf
@@@ -1,27 -1,16 +1,16 @@@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.argeo.maven</groupId>
-               <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
        </parent>
-       <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc-cms</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC CMS</name>
-       <version>2.1.18-SNAPSHOT</version>
-       <properties>
-               <version.argeo-tp>2.1.27</version.argeo-tp>
-               <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
-               <version.slc>2.1.17-SNAPSHOT</version.slc>
-               <developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
-               <developmentCycle.slc>2.1</developmentCycle.slc>
-               <version.argeo-commons-legacy>2.1.86</version.argeo-commons-legacy>
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
-       </properties>
 -      <version>2.3-SNAPSHOT</version>
++      <version>2.1-SNAPSHOT</version>
        <modules>
                <!-- Argeo CMS extensions -->
                <module>org.argeo.cms.integration</module>
diff --cc cnf/build.bnd
index 0000000000000000000000000000000000000000,af9c91be7d16ae6c7acaec7b6fc6bf73060d539f..f39af41a12594bcbdb0e07b1236505549564026b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -${workspace}/cnf/unstable.bnd, \
+ -include: \
++${workspace}/cnf/testing.bnd, \
+ ${workspace}/cnf/argeo.bnd, \
+ -${workspace}/cnf/release.bnd
diff --cc cnf/maven.bnd
index 0000000000000000000000000000000000000000,bbd72adec484781db9ddb623f71d54adb067194d..05b92033aeb4caaf4773e064a224fa0db11292dd
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,3 +1,3 @@@
 -../cnf/unstable.bnd, \
+ -include: \
++../cnf/testing.bnd, \
+ ../cnf/argeo.bnd
diff --cc cnf/testing.bnd
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..cf327df9c55c6be10468811ad0727d58e0c8dbba
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,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=
index fa05eb016335b50456d00a58a8219a559d712294,b533a069ec92d82ae4c2a0bdbb8d6762e32d4976..686ce6b8af9723d53dcd12b2b2f3a60e5b6aeaaf
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <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 +19,7 @@@
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.minimal</artifactId>
-                       <version>2.1.18-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
  
index 83efaa3e07319babddc273f3ce529225d7c68398,276d1fa08d82face21a827eef8c00835c94025df..d0918bd1b2b477399dbda71d134798f0fc51ed32
@@@ -5,7 -5,7 +5,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.dep.minimal</artifactId>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.api</artifactId>
-                       <version>2.1.18-SNAPSHOT</version>
 -                      <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.1.18-SNAPSHOT</version>
 -                      <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.1.18-SNAPSHOT</version>
 -                      <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.1.18-SNAPSHOT</version>
 -                      <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.1.18-SNAPSHOT</version>
 -                      <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.1.18-SNAPSHOT</version>
 -                      <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.1.18-SNAPSHOT</version>
 -                      <version>2.3-SNAPSHOT</version>
++                      <version>2.1-SNAPSHOT</version>
                </dependency>
  
                <!-- CLI Agent -->
diff --cc dep/pom.xml
index 924f06a7f7d75c28e76bc455b8c7cb4d190fe670,c463f27cdfe7e1ed4ea1e047324461938acab394..9938793222653646f0d8d6926485ad3a26c18e60
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
index 0ab722a6b651592ab5c94224f99426f27641ab68,9e300ff2b59debd76c340a0ddd9907a0ff92cb34..39d0d730cbbe8b602a4f06dc00e8edeec82fdb4a
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc.ide</groupId>
                <artifactId>argeo-ide</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>features</artifactId>
index aac315d3b35b65397fa2946c44178741b9cc49a2,77945342af29e6cae944f857db9a7f02c7796896..05e4066cc59278c75939d4758305b3c8a93f1ec4
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc.ide</groupId>
                <artifactId>argeo-ide</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>plugins</artifactId>
diff --cc ide/pom.xml
index 7f618f0ba4307a9ada7666baef172bc8359c471d,1a94bc6af36cc1c415a45afe0515d9292d904348..f51a7ad5494b8d206877181792798f816044aba0
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.ide</groupId>
index a1ec434dd17280421c7afb31faad470cf258c9c2,7e0e0d806ffa68b068bd43e957e32b1b778ca6d0..d86bc3f421f07e4a7b29f485da8feacfd9180e26
@@@ -4,7 -4,7 +4,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.legacy.commons</groupId>
index 0000000000000000000000000000000000000000,0e6de0980b3199cbefb27a8b5254ff94ee5bfc3c..7eab2fa85d35525b71b5dee3526089e686432e91
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,158 +1,158 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Backend</name>
+       <dependencies>
+               <!-- SLC Minimal -->
+               <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>
+               <!-- SLC Libs -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.slc</groupId> -->
+               <!-- <artifactId>org.argeo.slc.lib.repo</artifactId> -->
+               <!-- <version>1.1.14-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.slc</groupId> -->
+               <!-- <artifactId>org.argeo.slc.lib.jcr</artifactId> -->
+               <!-- <version>1.1.14-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+               <!-- Extensions -->
+               <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> -->
+               <!-- <artifactId>org.argeo.slc.server.repo.webapp</artifactId> -->
+               <!-- <version>2.1.1-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+               <!-- UI -->
+               <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.1-SNAPSHOT</version>
+               </dependency>
+               <!-- OSGi Boot for platform generation only, as it could be used by regular 
+                       Java applications to launch an OSGi runtime. -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>test</scope>
+               </dependency>
+               <!-- Legacy Argeo Commons platform (Eclipse 3) -->
+               <dependency>
+                       <groupId>org.argeo.slc.legacy.commons</groupId>
+                       <artifactId>org.argeo.dep.cms.platform</artifactId>
+                       <version>${version.argeo-commons-legacy}</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>org.eclipse.jgit</artifactId>
+               </dependency>
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-argeo</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-slc-platform${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+                                                                                                       <includes>
+                                                                                                               <include>**/*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-platform${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-slc-spring${argeo.rpm.suffix}</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+ </project>
index 0000000000000000000000000000000000000000,e0bb73d26d53fa6b465e71bcc37a26f5e8c69f3f..2ea8ecee4598709c4802f37f8d382481f472eb7b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,288 +1,288 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Agent based on Spring</name>
+       <dependencies>
+               <!-- Parent dependencies -->
+               <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>
+               <!-- Spring-based Agent -->
+               <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, 
+                       in the process of being removed -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.legacy.fake.java8</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+               <!-- Not strictly Spring dependencies but used by the old approach -->
+               <dependency>
+                       <groupId>org.argeo.tp.apache.ant</groupId>
+                       <artifactId>org.apache.ant</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache.ant</groupId>
+                       <artifactId>org.apache.ant.launch</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.mail</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>com.jcraft.jsch</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache.commons</groupId>
+                       <artifactId>org.apache.commons.vfs</artifactId>
+               </dependency>
+               <!-- Base Spring dependency -->
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.beans</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.el</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.gemini</groupId>
+                       <artifactId>org.eclipse.gemini.blueprint.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.gemini</groupId>
+                       <artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.gemini</groupId>
+                       <artifactId>org.eclipse.gemini.blueprint.io</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>org.aspectj.weaver</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.misc</groupId>
+                       <artifactId>org.aopalliance</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.aop</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.context</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.expression</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.instrument</artifactId>
+               </dependency>
+               <!-- Spring -->
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.aspects</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.context.support</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.jdbc</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.tx</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.web</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.web.servlet</artifactId>
+               </dependency>
+               <!-- CLI Agent -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.slc</groupId> -->
+               <!-- <artifactId>org.argeo.slc.launcher</artifactId> -->
+               <!-- <version>1.1.12-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.slc</groupId> -->
+               <!-- <artifactId>org.argeo.slc.agent.cli</artifactId> -->
+               <!-- <version>2.1.1-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-argeo</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-slc-spring${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.released}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>true</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
+                                                                                                       <includes>
+                                                                                                               <include>**/*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-cms-node${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-slc${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-slc-tp${argeo.rpm.suffix}</require>
+                                                                               <require>argeo-slc-spring-tp${argeo.rpm.suffix}</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source-tp</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-slc-spring-tp${argeo.rpm.suffix}</name>
+                                                                       <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
+                                                                                                       <includes>
+                                                                                                               <include>**/*.jar</include>
+                                                                                                       </includes>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+ </project>
index 0000000000000000000000000000000000000000,affcea4a4677cb8541e6227f0c40964e4308a7c6..7386dc7ec7095e8359ff99f0f64854ceff4387c4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,108 +1,108 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>legacy-dep</artifactId>
+       <name>SLC Legacy Dependencies</name>
+       <packaging>pom</packaging>
+       <modules>
+               <module>org.argeo.slc.dep.spring</module>
+               <module>org.argeo.slc.dep.backend</module>
+       </modules>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <SLC-ModularDistribution>default</SLC-ModularDistribution>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>properties-maven-plugin</artifactId>
+                               <configuration>
+                                       <quiet>true</quiet>
+                                       <files>
+                                               <file>../../../cnf/${version.context}.bnd</file>
+                                       </files>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>argeo-osgi-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>generate-descriptors</id>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <attach>false</attach>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>org.junit</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>org.hamcrest</artifactId>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+                       <dependencies>
+                               <dependency>
+                                       <groupId>org.argeo.commons</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>${version.argeo-commons}</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
+ </project>
index 0000000000000000000000000000000000000000,c24dbfabc602a95e1dadd5bd1d2336b580be85d5..6b1e3de486199596d7b8b504ce1016fd57858ad4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,61 +1,61 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>lib</artifactId>
+       <packaging>pom</packaging>
+       <name>SLC Standard Libs</name>
+       <description>SLC execution modules for generic tasks, to be used as parent pom</description>
+       <properties>
+               <additionalImports.slc-lib>
+                       com.jcraft.jsch;resolution:=optional,
+                       org.apache.commons.exec;resolution:=optional,
+               </additionalImports.slc-lib>
+       </properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <SLC-ExecutionModule>default</SLC-ExecutionModule>
+                                               <!-- Minimal imports + some optional convenience imports -->
+                                               <Import-Package>
+                                                       org.argeo.security.jackrabbit;resolution:="optional",
+                                                       org.springframework.cglib.proxy;resolution:="optional",
+                                                       org.springframework.cglib.core;resolution:="optional",
+                                                       org.springframework.cglib.reflect;resolution:="optional",
+                                                       org.aopalliance.aop;resolution:="optional",
+                                                       org.argeo.slc.runtime,
+                                                       org.argeo.slc.core.execution;resolution:="optional",
+                                                       org.argeo.slc.core.execution.tasks;resolution:="optional",
+                                                       org.argeo.slc.execution,
+                                                       org.argeo.slc.osgi;resolution:="optional",
+                                                       org.argeo.slc.test,
+                                                       org.springframework.aop;resolution:="optional",
+                                                       org.springframework.aop.framework;resolution:="optional",
+                                                       org.springframework.aop.scope;resolution:="optional",
+                                                       org.springframework.beans.factory.config;resolution:="optional",
+                                                       org.springframework.core.io;resolution:="optional",
+                                                       ${additionalImports.slc-lib},
+                                                       *
+                                               </Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.dep.minimal</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+       </dependencies>
+ </project>
index bb725dc2638449f8137045977006efd56b42317a,4f99e712f5400c0e57c960fa11d78b2c820775a1..d0a7a7076e89b5186fc4ff0f50c73dd39447efeb
@@@ -3,7 -3,7 +3,7 @@@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>legacy</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
 -              <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.legacy.fake.java8</artifactId>
index 0000000000000000000000000000000000000000,437754af959107c388f74786fa94647db5f236b4..807cf654444579760d12b4c5eee1fcc9eb6de054
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,11 +1,11 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent.jcr</artifactId>
+       <name>SLC Agent JCR</name>
+ </project>
index 0000000000000000000000000000000000000000,fbf41ceffd7e5f8534ef50b55154ba406cbc3d49..2e4bea6942b368c43010154bdc03ff1a3c7c5375
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,11 +1,11 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.agent</artifactId>
+       <name>SLC Agent</name>
+ </project>
index 0000000000000000000000000000000000000000,c1decab151f27243636229f3ee7c3d66a286a853..c498506f050ec402835b684496958222be76a297
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,37 +1,37 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Client RAP</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <!-- SLC -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.repo</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+               <!-- Argeo common distribution for Secured UI -->
+               <dependency>
+                       <groupId>org.argeo.slc.legacy.commons</groupId>
+                       <artifactId>org.argeo.cms.ui.workbench.rap</artifactId>
+                       <version>${version.argeo-commons-legacy}</version>
+               </dependency>
+               <!-- RAP workbench -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,81c5c8d611dd552f8d3c34adb4f0ee013d13321b..4987819878e2d17d6edbf588cb7f4aa0b970a21a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,66 +1,66 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Client UI Distribution</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <!-- Commons UI -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.legacy.commons</groupId>
+                       <artifactId>org.argeo.cms.ui.workbench</artifactId>
+                       <version>${version.argeo-commons-legacy}</version>
+               </dependency>
+               <!-- SLC repo -->
+               <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.1-SNAPSHOT</version>
+               </dependency>
+               <!-- Argeo Base dependencies -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.core</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <!-- RAP workbench -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,6fe69c8ebb4ca182485bdd21dfde158367cf2414..454dedf726dbb1d5f2318b85dc9ab62190485a76
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,53 +1,53 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Client UI</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <!-- SLC -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.spring</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+               <!-- Argeo Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.api</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.eclipse.ui.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.legacy.commons</groupId>
+                       <artifactId>org.argeo.cms.ui.workbench</artifactId>
+                       <version>${version.argeo-commons-legacy}</version>
+               </dependency>
+               <!-- RAP workbench -->
+               <dependency>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>argeo-tp-rap-e3</artifactId>
+                       <version>${version.argeo-tp}</version>
+                       <type>pom</type>
+                       <scope>provided</scope>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,caabffa8e5c7aac6908667e5db3b8d0b40100650..7107a5beeedcc33c4fc6a18101382d2bcbb0fab3
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,11 +1,11 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>lib</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>lib</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.ant</artifactId>
+       <name>SLC Demo Ant</name>
+ </project>
index 0000000000000000000000000000000000000000,e900aab4bc7affac89c81fee1a2fc8b0930a1010..f4fe2cff496b4a3db16f6a41dfe99e5d9f628852
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,42 +1,42 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>lib</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>lib</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.basic</artifactId>
+       <name>SLC Demo Basic</name>
+ <!--  <build> -->
+ <!--          <plugins> -->
+ <!--                  <plugin> -->
+ <!--                          <groupId>org.apache.felix</groupId> -->
+ <!--                          <artifactId>maven-bundle-plugin</artifactId> -->
+ <!--                          <configuration> -->
+ <!--                                  <instructions> -->
+ <!--                                          <SLC-ExecutionModule>default</SLC-ExecutionModule> -->
+ <!--                                          <Import-Package> -->
+ <!--                                                  *, -->
+ <!--                                                  org.argeo.slc.core.structure.tree, -->
+ <!--                                                  net.sf.cglib.core, -->
+ <!--                                                  net.sf.cglib.proxy, -->
+ <!--                                                  net.sf.cglib.reflect, -->
+ <!--                                                  org.aopalliance.aop, -->
+ <!--                                                  org.argeo.slc.core.execution, -->
+ <!--                                                  org.argeo.slc.core.execution.tasks, -->
+ <!--                                                  org.argeo.slc.execution, -->
+ <!--                                                  org.argeo.slc.osgi, -->
+ <!--                                                  org.springframework.aop, -->
+ <!--                                                  org.springframework.aop.framework, -->
+ <!--                                                  org.springframework.aop.scope, -->
+ <!--                                                  org.springframework.beans.factory.config, -->
+ <!--                                                  org.springframework.core.io,                                                                                             -->
+ <!--                                          </Import-Package> -->
+ <!--                                  </instructions> -->
+ <!--                          </configuration> -->
+ <!--                  </plugin> -->
+ <!--          </plugins> -->
+ <!--  </build> -->
+ </project>
index 0000000000000000000000000000000000000000,2c189128b510899c67c96b6be7bd22b95e81d05d..09631dab53567ca336397db077cee8497fbfa3fa
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,11 +1,11 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>lib</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>lib</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.minimal</artifactId>
+       <name>SLC Demo Minimal</name>
+ </project>
index 0000000000000000000000000000000000000000,c073f604c7dd9d61995bb8e8bb1e1dc7fd781b33..18bd6cca885fc8c0f623851ed390a305c860c4bd
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,71 +1,71 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.launcher</artifactId>
+       <packaging>jar</packaging>
+       <name>SLC Launcher</name>
+       <build>
+               <plugins>
+ <!--                  <plugin> -->
+ <!--                          <groupId>org.apache.maven.plugins</groupId> -->
+ <!--                          <artifactId>maven-assembly-plugin</artifactId> -->
+ <!--                          <configuration> -->
+ <!--                                  <descriptors> -->
+ <!--                                          <descriptor>assembly/base.xml</descriptor> -->
+ <!--                                  </descriptors> -->
+ <!--                          </configuration> -->
+ <!--                          <executions> -->
+ <!--                                  <execution> -->
+ <!--                                          <id>assembly-base</id> -->
+ <!--                                          <phase>package</phase> -->
+ <!--                                          <goals> -->
+ <!--                                                  <goal>single</goal> -->
+ <!--                                          </goals> -->
+ <!--                                  </execution> -->
+ <!--                          </executions> -->
+ <!--                  </plugin> -->
+ <!--                  <plugin> -->
+ <!--                          <groupId>org.apache.felix</groupId> -->
+ <!--                          <artifactId>maven-bundle-plugin</artifactId> -->
+ <!--                          <configuration> -->
+ <!--                                  <instructions> -->
+ <!--                                          <Main-Class>org.argeo.slc.cli.SlcMain</Main-Class> -->
+ <!--                                  </instructions> -->
+ <!--                          </configuration> -->
+ <!--                  </plugin> -->
+ <!--                  <plugin> -->
+ <!--                          <artifactId>maven-resources-plugin</artifactId> -->
+ <!--                          <executions> -->
+ <!--                                  <execution> -->
+ <!--                                          <phase>validate</phase> -->
+ <!--                                          <goals> -->
+ <!--                                                  <goal>copy-resources</goal> -->
+ <!--                                          </goals> -->
+ <!--                                          <configuration> -->
+ <!--                                                  <outputDirectory>${basedir}/target/base</outputDirectory> -->
+ <!--                                                  <resources> -->
+ <!--                                                          <resource> -->
+ <!--                                                                  <directory>base</directory> -->
+ <!--                                                                  <filtering>true</filtering> -->
+ <!--                                                          </resource> -->
+ <!--                                                  </resources> -->
+ <!--                                          </configuration> -->
+ <!--                                  </execution> -->
+ <!--                          </executions> -->
+ <!--                  </plugin> -->
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,a34ec7041838c34445770976aec09ca33a2b621c..95f8827d002e7d7eff7f19b13ebe1b6924bdf4f7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,11 +1,11 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.server.repo</artifactId>
+       <name>SLC Repo</name>
+ </project>
index 0000000000000000000000000000000000000000,fc025e6d6ab081c3d175ef686b6cb968155c117b..13e8f907a1154da4f3b469d4a5819856a3dfc3b4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,95 +1,95 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.spring</artifactId>
+       <name>SLC Spring Runtime</name>
+       <dependencies>
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.enterprise</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.api</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.jcr</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <scope>provided</scope>
+               </dependency>
+               <!-- SLC -->
+               <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.1-SNAPSHOT</version>
+               </dependency>
+               <!-- Spring -->
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.beans</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.context</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.expression</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.spring</groupId>
+                       <artifactId>org.springframework.aop</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.gemini</groupId>
+                       <artifactId>org.eclipse.gemini.blueprint.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.gemini</groupId>
+                       <artifactId>org.eclipse.gemini.blueprint.io</artifactId>
+               </dependency>
+               <!-- Ant -->
+               <dependency>
+                       <groupId>org.argeo.tp.apache.ant</groupId>
+                       <artifactId>org.apache.ant</artifactId>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,06f048d7e5d1832eb6f82e129d235722e0b424e3..52008065df99a969b1108222bc4a1a4400a9b710
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,24 +1,24 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>legacy</artifactId>
 -                      <version>2.3-SNAPSHOT</version>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.support</artifactId>
+       <name>SLC Third Party Support</name>
+       <dependencies>
+               <!-- SLC Runtime -->
+               <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.1-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+ </project>
diff --cc legacy/pom.xml
index e6c9c6b075f800f7ffcef8b4190eeea294a3c1d3,23ccdaa4163d04e9ce3ad2d024e0c2cae2d35951..682bea9c32e96ff35a9554e399cd9b94b6457a4e
@@@ -1,13 -1,15 +1,15 @@@
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <groupId>org.argeo.maven</groupId>
-               <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <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</groupId>
        <artifactId>legacy</artifactId>
-       <version>2.1.18-SNAPSHOT</version>
 -      <version>2.3-SNAPSHOT</version>
++      <version>2.1-SNAPSHOT</version>
        <packaging>pom</packaging>
        <name>SLC Legacy Argeo Software</name>
        <properties>
index 0000000000000000000000000000000000000000,f943ccce0e412a384f97608b9ef44ce617abca34..c8f3ae2ab21d24dfe8ba490d4f777ccb5c20b5da
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,13 +1,13 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
++              <version>2.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.api</artifactId>
+       <name>SLC API</name>
+ </project>
index 0000000000000000000000000000000000000000,dadb1c73af6948c5e1168283e1c9cbba268c036b..0b5c4ed265c0d98d2862fd550fccb9a79ac1afcc
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,24 +1,24 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Factory</name>
+       <dependencies>
+               <!-- SLC -->
+               <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.1-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,0212f04db88c5ddc1f0656f1ba9861f5a289dfd4..b525c28186e94f067b512b77d19ac48117c927fc
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,47 +1,47 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC JCR implementations</name>
+       <dependencies>
+               <!-- SLC -->
+               <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.1-SNAPSHOT</version>
+               </dependency>
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.enterprise</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.api</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.jcr</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,200b1161e792e619d50aed3e1f4319d5732d0872..155214ecf10feccec6d05619c887241ec1f92cfc
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,37 +1,37 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Repo</name>
+       <dependencies>
+               <!-- SLC API -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.api</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.jcr</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <!-- BND -->
+               <dependency>
+                       <groupId>org.argeo.tp.sdk</groupId>
+                       <artifactId>biz.aQute.bndlib</artifactId>
+               </dependency>
+       </dependencies>
+ </project>
index 0000000000000000000000000000000000000000,0c3283969d41b3be98ebc8ac9f4789888e52cde1..a9bf496f05a957c86348a1cae7bf13c4d3ba1e70
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,19 +1,19 @@@
 -              <version>2.3-SNAPSHOT</version>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.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>
+       <name>SLC Runtime</name>
+       <dependencies>
+               <!-- SLC -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.api</artifactId>
++                      <version>2.1-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+ </project>
diff --cc pom.xml
index 768f4a698afe559f00b9a0a768db918c04f8006b,8a27ddd420bbd90e4675a8f9fbf141498ad29b2a..661b19441c5e571ba67898ce0db3eb21a4bd3001
+++ b/pom.xml
@@@ -9,22 -9,26 +9,26 @@@
        <artifactId>argeo-slc</artifactId>
        <packaging>pom</packaging>
        <name>Argeo SLC</name>
-       <version>2.1.18-SNAPSHOT</version>
 -      <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.1.104-SNAPSHOT</version.argeo-commons>
 -              <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
++              <version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
  
-               <version.slc>2.1.18-SNAPSHOT</version.slc>
                <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.86</version.argeo-commons-legacy>
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+               <version.argeo-commons-legacy>2.1.87-SNAPSHOT</version.argeo-commons-legacy>
        </properties>
        <modules>
-               <!-- Legacy UI -->
-               <module>legacy</module>
+               <!-- SLC framework -->
+               <module>org.argeo.slc.api</module>
+               <module>org.argeo.slc.runtime</module>
+               <module>org.argeo.slc.jcr</module>
+               <module>org.argeo.slc.repo</module>
+               <module>org.argeo.slc.factory</module>
+               
+               <!-- CMS extensions -->
                <module>cms</module>
  
                <!-- Distribution -->
                                <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>
+                       <url>http://repo1.maven.org/maven2</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
        </repositories>
        <distributionManagement>
                <site>