From: Mathieu Baudier Date: Thu, 4 Feb 2021 15:51:32 +0000 (+0100) Subject: Merge branch 'master' of https://mbaudier@code.argeo.org/git/gpl/argeo-suite.git X-Git-Tag: argeo-suite-2.3.0~3 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=752c9319203b089119cadf68b4d58ca9d39a027c;hp=dbca011c6417660a7028c3d4503b458211a9dc93 Merge branch 'master' of https://mbaudier@code.argeo.org/git/gpl/argeo-suite.git --- diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml index dc13fe7..7170b60 100644 --- a/core/org.argeo.entity.api/pom.xml +++ b/core/org.argeo.entity.api/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.entity.api diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml index af56710..ce80701 100644 --- a/core/org.argeo.entity.core/pom.xml +++ b/core/org.argeo.entity.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.entity.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.api - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml index 90ef5b0..ab50589 100644 --- a/core/org.argeo.entity.ui/pom.xml +++ b/core/org.argeo.entity.ui/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.argeo.suite core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.entity.ui @@ -16,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml index 11bc02b..2b04503 100644 --- a/core/org.argeo.suite.core/pom.xml +++ b/core/org.argeo.suite.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.suite.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/core/org.argeo.suite.theme.default/pom.xml b/core/org.argeo.suite.theme.default/pom.xml index 9c81005..ad44a95 100644 --- a/core/org.argeo.suite.theme.default/pom.xml +++ b/core/org.argeo.suite.theme.default/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.suite.theme.default diff --git a/core/org.argeo.suite.ui.rap/pom.xml b/core/org.argeo.suite.ui.rap/pom.xml index 4316afa..6fe9d52 100644 --- a/core/org.argeo.suite.ui.rap/pom.xml +++ b/core/org.argeo.suite.ui.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.suite.ui.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml index 82656e2..b73e974 100644 --- a/core/org.argeo.suite.ui/pom.xml +++ b/core/org.argeo.suite.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.suite.ui @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index c26b10f..7b2bb42 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. core diff --git a/dep/org.argeo.suite.dep.e4.rap/pom.xml b/dep/org.argeo.suite.dep.e4.rap/pom.xml index f084166..774b4dd 100644 --- a/dep/org.argeo.suite.dep.e4.rap/pom.xml +++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite dep - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.suite.dep.e4.rap @@ -15,7 +15,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT pom diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml index 9fe9e6a..b730b7f 100644 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 org.argeo.suite dep - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.suite.dep.ui.rap @@ -17,84 +15,84 @@ org.argeo.suite org.argeo.entity.api - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.entity.core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.suite.core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.suite.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.suite.theme.default - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.suite.ui.rap - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.people.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.documents.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.geo.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.publishing.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.support.odk - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.support.geonames - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/dep/pom.xml b/dep/pom.xml index 44586f6..a6c6515 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. dep diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml index fd8c8d6..5593556 100644 --- a/dist/argeo-office/pom.xml +++ b/dist/argeo-office/pom.xml @@ -3,7 +3,7 @@ org.argeo.suite dist - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. argeo-office @@ -28,7 +28,7 @@ org.argeo.suite org.argeo.suite.dep.e4.rap - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.commons diff --git a/dist/argeo-suite-demo/pom.xml b/dist/argeo-suite-demo/pom.xml index 82c12a0..fc4c43c 100644 --- a/dist/argeo-suite-demo/pom.xml +++ b/dist/argeo-suite-demo/pom.xml @@ -3,7 +3,7 @@ org.argeo.suite dist - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. argeo-suite-demo diff --git a/dist/pom.xml b/dist/pom.xml index d45256a..e9ca515 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. dist diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml index f7d6d2b..d101c1a 100644 --- a/environment/org.argeo.geo.ui/pom.xml +++ b/environment/org.argeo.geo.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite environment - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.geo.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/environment/pom.xml b/environment/pom.xml index a8ede8b..1045802 100644 --- a/environment/pom.xml +++ b/environment/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. environment diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml index 3a56edd..2613456 100644 --- a/knowledge/org.argeo.support.geonames/pom.xml +++ b/knowledge/org.argeo.support.geonames/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite knowledge - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.support.geonames diff --git a/knowledge/org.argeo.support.odk/pom.xml b/knowledge/org.argeo.support.odk/pom.xml index bea3e54..887ccef 100644 --- a/knowledge/org.argeo.support.odk/pom.xml +++ b/knowledge/org.argeo.support.odk/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite knowledge - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.support.odk @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml index 5481518..4191708 100644 --- a/knowledge/org.argeo.support.xforms/pom.xml +++ b/knowledge/org.argeo.support.xforms/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite knowledge - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.support.xforms @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/knowledge/pom.xml b/knowledge/pom.xml index ddbe5c4..65c8af3 100644 --- a/knowledge/pom.xml +++ b/knowledge/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. knowledge diff --git a/lib/pom.xml b/lib/pom.xml index c238678..4501d11 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -10,7 +10,7 @@ pom Parent POM for Argeo Suite Extensions - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT 2.1.27 @@ -29,7 +29,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT provided diff --git a/library/org.argeo.documents.ui/pom.xml b/library/org.argeo.documents.ui/pom.xml index fc4ec57..9e8e4c3 100644 --- a/library/org.argeo.documents.ui/pom.xml +++ b/library/org.argeo.documents.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite library - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.documents.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/library/pom.xml b/library/pom.xml index 9f48245..cddf062 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. library diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml index 2167104..1d067d6 100644 --- a/people/org.argeo.people.ui/pom.xml +++ b/people/org.argeo.people.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite people - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.people.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/people/pom.xml b/people/pom.xml index cd9716e..a95bf86 100644 --- a/people/pom.xml +++ b/people/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. people diff --git a/pom.xml b/pom.xml index dd86622..f4b5266 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom Argeo Suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT 2.1.27 diff --git a/publishing/org.argeo.publishing.ui/pom.xml b/publishing/org.argeo.publishing.ui/pom.xml index 2b87db7..073fb6a 100644 --- a/publishing/org.argeo.publishing.ui/pom.xml +++ b/publishing/org.argeo.publishing.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite publishing - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. org.argeo.publishing.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT diff --git a/publishing/pom.xml b/publishing/pom.xml index 44ac16e..41275ec 100644 --- a/publishing/pom.xml +++ b/publishing/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.1.18-SNAPSHOT + 2.3.0-SNAPSHOT .. publishing