Merge remote-tracking branch 'origin/v2.x'

diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml
index 731d8aed132fc25ab6f2e3e0ed1c6508b9f17af3..c0723fe8414d98fa6787f767005293bb1e3bbab9 100644 (file)
--- a/core/org.argeo.entity.api/pom.xml
+++ b/core/org.argeo.entity.api/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.api</artifactId>

diff --git a/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index b30657d06c536c12fab0102d85cee7b5518d1702..b64a275a116788f9a5e1fbdf0f83d164e445d07d 100644 (file)
--- a/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/core/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -43,7 +43,7 @@ mixin
 
 [entity:term]
 orderable
-- name (NAME) m
+- name (NAME)
 - * (*)
 + term (entity:term) = entity:term *
 

diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml
index 4f939ab38167f3e61b8bd97b78d23e21dfa325d8..39b697e72ea132c5bff5fd50249f947f41f11d70 100644 (file)
--- a/core/org.argeo.entity.core/pom.xml
+++ b/core/org.argeo.entity.core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.core</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml
index 103b3e957cd201b3151e9a7d2fb5a7f7398ffca3..d635fbf8664096d7c4b00ed3a490b26239b8844a 100644 (file)
--- a/core/org.argeo.entity.ui/pom.xml
+++ b/core/org.argeo.entity.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml
index da1326673771d012798ee2ffc653d196fa2cc836..0c1d40bef094797c77183662f63583cbd19f02d2 100644 (file)
--- a/core/org.argeo.suite.core/pom.xml
+++ b/core/org.argeo.suite.core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.core</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.suite.theme.default/pom.xml b/core/org.argeo.suite.theme.default/pom.xml
index b5d1585a1146a4a1ae6cfdd4ae6d2bb9fb1d2afb..e9f009237426d36f0d6d0c0d88f9b731c058a992 100644 (file)
--- a/core/org.argeo.suite.theme.default/pom.xml
+++ b/core/org.argeo.suite.theme.default/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.theme.default</artifactId>

diff --git a/core/org.argeo.suite.ui.rap/pom.xml b/core/org.argeo.suite.ui.rap/pom.xml
index d4e275358d7f09775815758c196dfb4341dac36f..a8a1e80bef085bf917230586a029dd8af1b01770 100644 (file)
--- a/core/org.argeo.suite.ui.rap/pom.xml
+++ b/core/org.argeo.suite.ui.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.ui.rap</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml
index 724e103573a22e4f2320628076ba807b532d44dc..2436864320daf359a1f7f1879b4515fbfbefe05f 100644 (file)
--- a/core/org.argeo.suite.ui/pom.xml
+++ b/core/org.argeo.suite.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>core</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.ui</artifactId>
@@ -14,12 +14,12 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
index b2ebcb297b1e6200d65d937eedb3f02d98023714..46de1770abf67a9eeebab2b61a830f743941f071 100644 (file)
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
@@ -59,15 +59,20 @@ public class DefaultLeadPane implements CmsUiProvider {
                appLayersC.setLayout(layout);
                appLayersC.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false));
 
-               Composite adminLayersC = new Composite(parent, SWT.NONE);
-               CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
-               GridLayout adminLayout = new GridLayout();
-               adminLayout.verticalSpacing = 10;
-               adminLayout.marginBottom = 10;
-               adminLayout.marginLeft = 10;
-               adminLayout.marginRight = 10;
-               adminLayersC.setLayout(adminLayout);
-               adminLayersC.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, true));
+               Composite adminLayersC;
+               if (!adminLayers.isEmpty()) {
+                       adminLayersC = new Composite(parent, SWT.NONE);
+                       CmsUiUtils.style(adminLayersC, SuiteStyle.leadPane);
+                       GridLayout adminLayout = new GridLayout();
+                       adminLayout.verticalSpacing = 10;
+                       adminLayout.marginBottom = 10;
+                       adminLayout.marginLeft = 10;
+                       adminLayout.marginRight = 10;
+                       adminLayersC.setLayout(adminLayout);
+                       adminLayersC.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, true));
+               } else {
+                       adminLayersC = null;
+               }
 
 //             boolean isAdmin = cmsView.doAs(() -> CurrentUser.isInRole(NodeConstants.ROLE_USER_ADMIN));
                Set<String> userRoles = cmsView.doAs(() -> CurrentUser.roles());

diff --git a/core/pom.xml b/core/pom.xml
index 55ff5e2cba65519df0f7e8c32f8537d9a16d8487..a8ef5a0355662cf19ca29d2b89c61e221aa17c93 100644 (file)
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>core</artifactId>

diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index b147caf4190676564c91367216c445b535897a12..30ff3b6bea805afe043965317b45ee180d047dc8 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
 

diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml
index 750310e7eb9246ca60f97c80a283ebf8bc1f5540..a70a582902de3525625afe0a2f05c5253b46b037 100644 (file)
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
@@ -15,17 +15,17 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Suite Icons -->
@@ -39,67 +39,67 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.theme.default</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui.rap</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo People -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.people.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Library -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.documents.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Environment -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.geo.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Publishing -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.publishing.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Knowledge -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.odk</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.geonames</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Additional Third Parties -->

diff --git a/dep/pom.xml b/dep/pom.xml
index cac28470744b6727d630cd91f6fed0a7742cd32d..60dc03490ecca4a50f22501d700131fbfc721d10 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>

diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml
index c205bd7cfab8cc605e2801079b560e71e8257793..dc4c578342dd7de45cc195f3cb347fb210ea40ca 100644 (file)
--- a/dist/argeo-office/pom.xml
+++ b/dist/argeo-office/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-office</artifactId>
@@ -28,7 +28,7 @@
                                <dependency>
                                        <groupId>org.argeo.suite</groupId>
                                        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
-                                       <version>2.1.22-SNAPSHOT</version>
+                                       <version>2.3.1-SNAPSHOT</version>
                                </dependency>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>

diff --git a/dist/argeo-suite-demo/pom.xml b/dist/argeo-suite-demo/pom.xml
index 850ae4e0e2eb7bfd988a2e4bc98dad7f09bf8914..c31fc7dedb6a8fb60fa3b433b534b5f6706997ae 100644 (file)
--- a/dist/argeo-suite-demo/pom.xml
+++ b/dist/argeo-suite-demo/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-suite-demo</artifactId>

diff --git a/dist/pom.xml b/dist/pom.xml
index 8b31d0ab46e24632ddb3f6de3166adf3ae849b67..38c2521bfd38c7e756b3b4dcecfc43e3860f4a44 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>

diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml
index bc4c068a162e4a6493478a36e907423cd3786a7e..a5a4711db8257aad207f5721336fb343ada01c34 100644 (file)
--- a/environment/org.argeo.geo.ui/pom.xml
+++ b/environment/org.argeo.geo.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>environment</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.geo.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/environment/pom.xml b/environment/pom.xml
index 53d22d3b8baf8d149b43f287469e460d8673f8ef..7e13702d56a5fca8f60e97d81431bdb927448625 100644 (file)
--- a/environment/pom.xml
+++ b/environment/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>environment</artifactId>

diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml
index d6ed666ca6af61f16707ab070ad065db7e377cf3..7587ef365e78d51fabd5bf6d08a2ca3a4cfc4165 100644 (file)
--- a/knowledge/org.argeo.support.geonames/pom.xml
+++ b/knowledge/org.argeo.support.geonames/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.geonames</artifactId>

diff --git a/knowledge/org.argeo.support.odk/pom.xml b/knowledge/org.argeo.support.odk/pom.xml
index 01c8ce93a1dbb22902ea889eca3a649ce9d47a6e..2b6834770523505f5f2a2f59c5623230e345a163 100644 (file)
--- a/knowledge/org.argeo.support.odk/pom.xml
+++ b/knowledge/org.argeo.support.odk/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.odk</artifactId>
@@ -14,12 +14,12 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml
index 95717b9c56ab47eb4abe97769d2649ecfcf205ae..d97f8c72da9bd613416608275d26fed9f96eeb87 100644 (file)
--- a/knowledge/org.argeo.support.xforms/pom.xml
+++ b/knowledge/org.argeo.support.xforms/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>knowledge</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.xforms</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/knowledge/pom.xml b/knowledge/pom.xml
index 6bfec4e37ec7d62ba2918ccd05841ea7749fde11..6a0890ef7d9008c6311bfd1223d455b6726fd02e 100644 (file)
--- a/knowledge/pom.xml
+++ b/knowledge/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>knowledge</artifactId>

diff --git a/lib/pom.xml b/lib/pom.xml
index 416484d8376b6c2c3c87e61d4a78b9cc9eb07ba5..b3a10b9e617c68085c089b02a0653676fbc74876 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -10,15 +10,15 @@
        <packaging>pom</packaging>
        <name>Parent POM for Argeo Suite Extensions</name>
        <description />
-       <version>2.1.22-SNAPSHOT</version>
+       <version>2.3.1-SNAPSHOT</version>
        <properties>
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.102-SNAPSHOT</version.argeo-commons>
-               <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
+               <version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
+               <version.argeo-suite-icons>2.1.0</version.argeo-suite-icons>
 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <dependencies>
@@ -30,7 +30,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                        <scope>provided</scope>
                        <exclusions>
                                <exclusion>
@@ -92,6 +92,18 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
+               <repository>
+                       <id>argeo-unstable</id>
+                       <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
        </repositories>
        <reporting>
                <plugins>
@@ -160,8 +172,4 @@
                        </plugin>
                </plugins>
        </reporting>
-
-  <scm>
-    <tag>v2.x</tag>
-  </scm>
 </project>

diff --git a/library/org.argeo.documents.ui/pom.xml b/library/org.argeo.documents.ui/pom.xml
index 1684f4fe602354a44b2e5ceaef35c16eb5cbd1c8..2c59ff32c35c2039f502325a56a0236b1e862e47 100644 (file)
--- a/library/org.argeo.documents.ui/pom.xml
+++ b/library/org.argeo.documents.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>library</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.documents.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/library/pom.xml b/library/pom.xml
index dd8326732d0ffc8c4648ba880d824a640be83c8f..ea3ef63ea4395507d25c3de28695f60f2faebdf3 100644 (file)
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>library</artifactId>

diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml
index 2ce72fb4f32d3d4b6620ee04fa0ac4cadc594f02..07589a464c9a9b2b597a938ebde2d941b7aa28ee 100644 (file)
--- a/people/org.argeo.people.ui/pom.xml
+++ b/people/org.argeo.people.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>people</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.people.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/people/pom.xml b/people/pom.xml
index 50ba63f004bb07b202c8178e3053948ef8822cf0..193f6337c8dae04a8a1b1e1e623c195a6aec24f3 100644 (file)
--- a/people/pom.xml
+++ b/people/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>people</artifactId>

diff --git a/pom.xml b/pom.xml
index 4161919c50ab5d13ae224fbe3cd4e594a34a0522..4e8207b3da6599091eac9c46ad53ff28c9bf39ad 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<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>
@@ -7,7 +9,7 @@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.1.22-SNAPSHOT</version>
+       <version>2.3.1-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
@@ -15,10 +17,10 @@
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-               <version.argeo-commons>2.1.102-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
                <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
 
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>
@@ -39,7 +41,7 @@
                <connection>scm:git:http://git.argeo.org/gpl/argeo-suite.git</connection>
                <url>http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary</url>
                <developerConnection>scm:git:https://code.argeo.org/git/gpl/argeo-suite.git</developerConnection>
-               <tag>v2.x</tag>
+               <tag>HEAD</tag>
        </scm>
        <organization>
                <name>Argeo GmbH</name>
@@ -106,6 +108,18 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
+               <repository>
+                       <id>argeo-unstable</id>
+                       <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
+                       <releases>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
        </repositories>
        <reporting>
                <plugins>
@@ -177,7 +191,7 @@
        <distributionManagement>
                <repository>
                        <id>staging</id>
-                       <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
+                       <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>

diff --git a/publishing/org.argeo.publishing.ui/pom.xml b/publishing/org.argeo.publishing.ui/pom.xml
index 6c67b97ad6b04ade07e668c8a317b2fc6bb5f234..b70057c7a7801c39d48a972083f31e0a13a58dd1 100644 (file)
--- a/publishing/org.argeo.publishing.ui/pom.xml
+++ b/publishing/org.argeo.publishing.ui/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>publishing</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.publishing.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.1.22-SNAPSHOT</version>
+                       <version>2.3.1-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/publishing/pom.xml b/publishing/pom.xml
index 6e92d54e457d3c644dcebbf485b74a6af48d7ae8..5dfdd446d4e3f56c45ec8229f71b6136dcb246f7 100644 (file)
--- a/publishing/pom.xml
+++ b/publishing/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.22-SNAPSHOT</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>publishing</artifactId>