Use new build approach.

diff --git a/.gitignore b/.gitignore
index e3d2422940bbb14f159d0eba593d3543511bf54f..950facde1d6e1cd331c2a052207a807463e8a3dd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-/target/
-/.DS_Store
+**/bin/
+**/target/
+**/generated/
+**/MANIFEST.MF
+**/.DS_Store

diff --git a/cnf/.gitignore b/cnf/.gitignore
new file mode 100644 (file)
index 0000000..12011f0
--- /dev/null
+++ b/cnf/.gitignore
@@ -0,0 +1 @@
+/release.bnd

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
new file mode 100644 (file)
index 0000000..82c8c08
--- /dev/null
+++ b/cnf/argeo.bnd
@@ -0,0 +1,15 @@
+# Common
+qualifier=.next
+
+Bundle-Version: ${version.released}${qualifier}
+Private-Package: *.internal.*
+Export-Package: !*.internal.*, *
+-consumer-policy : ${range;[==,=+)}
+-savemanifest : META-INF/MANIFEST.MF
+-includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
+-compression STORE
+-source true
+-removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
+Automatic-Module-Name: ${bsn}
+SLC-Category=${category}
+-groupid=${category}

diff --git a/cnf/build.bnd b/cnf/build.bnd
new file mode 100644 (file)
index 0000000..af9c91b
--- /dev/null
+++ b/cnf/build.bnd
@@ -0,0 +1,4 @@
+-include: \
+${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/argeo.bnd, \
+-${workspace}/cnf/release.bnd

diff --git a/cnf/maven.bnd b/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..bbd72ad
--- /dev/null
+++ b/cnf/maven.bnd
@@ -0,0 +1,3 @@
+-include: \
+../cnf/unstable.bnd, \
+../cnf/argeo.bnd

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

diff --git a/core/cnf/maven.bnd b/core/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
+++ b/core/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file

diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml
index f916967f2b30c8966325ba2d01ae7cf95c14dad2..c13a40dfd444c425b475b9d28f9935aa241a33d9 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.api</artifactId>

diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml
index 8d9144737dc84e85857c6d53cb17ae92a819b1f8..e3a5b7694070934ef355fe5ed2a23372d0c7ea97 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.core</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.api</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml
index a7b2e8199a905051db543cef53c5f84c8b26849d..0ac2270ca0cde59e0b83f538d9f2d62c1f0968c0 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.entity.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml
index 6008ea17637a58e364a24b97307b1c476cc3092a..283dba070fa43f37f9d9d9b62fcf0a72ab67576f 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.core</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-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 9e1014236ac0f222e9c69949ca33d81bacb1004d..1f5398a1874dcb66238c4c86174bcadd95912694 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.3.2-SNAPSHOT</version>
+               <version>2.3-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 c9e2f69b4ffa58258bc0d4c4bdac2556a5137ed4..c82e7ce11a8eee6dea699e79aae8e474585781fb 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.ui.rap</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml
index 7089a3c556ce1633a732cb1b366d6dce0e0741a0..c0cc0025984c08b8e9379aca95828c418a31c5de 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.ui</artifactId>
@@ -14,12 +14,12 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Commons -->

diff --git a/core/pom.xml b/core/pom.xml
index 40fa254034f57546a2890b8bbb6ee891244d1505..1ddbfc510919c0d7134b5a1b8f20943aa91922a3 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>core</artifactId>

diff --git a/dep/cnf/maven.bnd b/dep/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
+++ b/dep/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file

diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml
index e19244a3704d2f8889ad9484e09c22a5c00604b0..43ad96f766ab47cb1593f33304141ffa19f7169f 100644 (file)
--- a/dep/org.argeo.suite.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rap</artifactId>
@@ -15,7 +15,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-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 99d6f4649046fdd680e020aed438f5da288b50de..802b271ad1a7ae0c3368cf35f8b5ab0985bb52ff 100644 (file)
--- a/dep/org.argeo.suite.dep.ui.rap/pom.xml
+++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.3.2-SNAPSHOT</version>
+               <version>2.3-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.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.core</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.entity.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Suite Icons -->
@@ -39,67 +39,67 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.theme.default</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui.rap</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo People -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.people.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Library -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.library.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Environment -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.geo.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Publishing -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.publishing.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Argeo Knowledge -->
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.odk</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.geonames</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Additional Third Parties -->

diff --git a/dep/pom.xml b/dep/pom.xml
index d2ad0bb07d2c06732df84a47abae5281d9a11fb9..8d62610ee9d610db54d7d4e45fda1b19ffea0ac7 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>

diff --git a/dist/argeo-suite-standard/pom.xml b/dist/argeo-suite-standard/pom.xml
index 3eb2907db07428f92150d6363a18f091b84098a3..2f97b48c3e5af00e771536c5245c36abe6e5a90f 100644 (file)
--- a/dist/argeo-suite-standard/pom.xml
+++ b/dist/argeo-suite-standard/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dist</artifactId>
-               <version>2.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>argeo-suite-standard</artifactId>

diff --git a/dist/pom.xml b/dist/pom.xml
index f3d3d98ef2e77f6a1c7224bff88846f9aad4d7e4..c43a63e839085b278af988da19ba74b938fe3ebd 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>

diff --git a/environment/cnf/maven.bnd b/environment/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
+++ b/environment/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file

diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml
index bf6c422c78d6b205e8decb9a14fed184eb012d4b..f820ca1639e0bcd4576edea8d66fd245e09927bb 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.geo.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/environment/pom.xml b/environment/pom.xml
index 796818664338fbd347ca6a96b9c5b471142d2da2..e9728621a59815606e69d8f71f0cbb50cdb5ace8 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>environment</artifactId>

diff --git a/knowledge/cnf/maven.bnd b/knowledge/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
+++ b/knowledge/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file

diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml
index d4a900b5b426930401183635589440b91023ebb0..4352219e8de7474c024ca212cc7a93a7b81d12f7 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.3.2-SNAPSHOT</version>
+               <version>2.3-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 9156a31db4e7e9eec77a6bedeea434839efc54fe..98dfe259c1aad2bdb3712dc94c2c1255363c8831 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.odk</artifactId>
@@ -14,12 +14,12 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.support.xforms</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml
index e39b9a5ee2e17a00d641b6e499f019f2522a6455..44815ad4ef11f6561598cb509e98421b7953ea13 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.support.xforms</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.core</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/knowledge/pom.xml b/knowledge/pom.xml
index 066ce3b9ec9f6bc56f75dfd04d55814c004bff49..02d2d144cd5f545b6b895ee528e48fa97c04a545 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>knowledge</artifactId>

diff --git a/lib/pom.xml b/lib/pom.xml
index de0e32b4a7b98f5e2150b6672284746fbcf8f8e9..efa3a027469959194b6f6407a9ca9dd0327cb735 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -3,19 +3,19 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <version>2.1.4</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite-lib</artifactId>
        <packaging>pom</packaging>
        <name>Parent POM for Argeo Suite Extensions</name>
        <description />
-       <version>2.3.2-SNAPSHOT</version>
+       <version>2.3-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.103</version.argeo-commons>
+               <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
                <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
 
                <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo</argeo.rpm.stagingRepository>
@@ -30,7 +30,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.dep.ui.rap</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                        <scope>provided</scope>
                        <exclusions>
                                <!-- Avoid slf4j implementations lurking in the classpath. -->

diff --git a/library/cnf/maven.bnd b/library/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
+++ b/library/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file

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

diff --git a/library/pom.xml b/library/pom.xml
index 14721315a0d4a988940eee2258b0ac8b4ae09b0c..6cc06d2f24f8df051dda8264a71bdb0a62b0c37b 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>library</artifactId>

diff --git a/people/cnf/maven.bnd b/people/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
+++ b/people/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file

diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml
index ded3d2d7a272cd04ec7049f6140f12c13083f399..d3f24a80dd99d3cc14ba83122a0a7b66570fe27a 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.people.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/people/pom.xml b/people/pom.xml
index fe0abe095906bbd2f14fe8794efecfb13531fac7..46bb9a48c289bb7053d615b0ae79e630ca82ad14 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>people</artifactId>

diff --git a/pom.xml b/pom.xml
index 2290b0b2a8576eed7c217f06d1b157e859ba5ce5..91e7ac7e6b60449f05970d0d8b755da45371556e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.3</version>
+               <version>2.1.4</version>
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <version>2.3.2-SNAPSHOT</version>
+       <version>2.3-SNAPSHOT</version>
        <name>Argeo Suite</name>
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
@@ -17,11 +17,9 @@
                <!-- 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.104-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
                <!-- <version.argeo-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
                <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
-
-               <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>

diff --git a/publishing/cnf/maven.bnd b/publishing/cnf/maven.bnd
new file mode 100644 (file)
index 0000000..4bd5c0c
--- /dev/null
+++ b/publishing/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file

diff --git a/publishing/org.argeo.publishing.ui/pom.xml b/publishing/org.argeo.publishing.ui/pom.xml
index 6a3ed5ed672313d33d0de9ed0c5eadcb5893f70f..d7d0ccf49476d4039b1ad7ebf465f4053ea28cfb 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.publishing.ui</artifactId>
@@ -14,7 +14,7 @@
                <dependency>
                        <groupId>org.argeo.suite</groupId>
                        <artifactId>org.argeo.suite.ui</artifactId>
-                       <version>2.3.2-SNAPSHOT</version>
+                       <version>2.3-SNAPSHOT</version>
                </dependency>
 
                <!-- Eclipse E4 -->

diff --git a/publishing/pom.xml b/publishing/pom.xml
index cbfe76aa8240d92940eaa76c01de2c64fb589a22..885fa11cb0123f9c3c1bb3f20944d824e867ef60 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.3.2-SNAPSHOT</version>
+               <version>2.3-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>publishing</artifactId>