From: Mathieu Baudier Date: Fri, 3 Sep 2021 09:51:53 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into v2.x X-Git-Tag: argeo-suite-2.1.23~3 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=0346615633181e04be0bdac3dfb13e26cce0976f;hp=9218d0d47a4e6ebe497974ad7dfc637da63f11f6 Merge remote-tracking branch 'origin/master' into v2.x --- diff --git a/core/org.argeo.entity.api/pom.xml b/core/org.argeo.entity.api/pom.xml index f916967..1d2e27f 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.entity.api diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml index 8d91447..210aa22 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.entity.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.api - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml index a7b2e81..469fc80 100644 --- a/core/org.argeo.entity.ui/pom.xml +++ b/core/org.argeo.entity.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.entity.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml index 6008ea1..2ca0e5b 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.suite.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/core/org.argeo.suite.theme.default/pom.xml b/core/org.argeo.suite.theme.default/pom.xml index 9e10142..5afd257 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.3.2-SNAPSHOT + 2.1.23-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 c9e2f69..35d1ccf 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.suite.ui.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml index 7089a3c..c1bf9b4 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.suite.ui @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 40fa254..89a7048 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-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 e19244a..16f134a 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.suite.dep.e4.rap @@ -15,7 +15,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT pom diff --git a/dep/org.argeo.suite.dep.e4.rcp/pom.xml b/dep/org.argeo.suite.dep.e4.rcp/pom.xml index f525362..119d7a0 100644 --- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml +++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml @@ -6,7 +6,7 @@ org.argeo.suite dep - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.suite.dep.e4.rcp diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml index 99d6f46..88c35b7 100644 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite dep - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.suite.dep.ui.rap @@ -15,17 +15,17 @@ org.argeo.suite org.argeo.entity.api - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.entity.core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT @@ -39,67 +39,67 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.suite.theme.default - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.suite.ui.rap - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.people.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.library.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.geo.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.publishing.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.support.odk - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.support.geonames - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT @@ -246,7 +246,7 @@ rpm - argeo-suite-ui-rap-unstable + argeo-suite-ui-rap /usr/share/osgi @@ -266,7 +266,7 @@ argeo-cms-ui-rap - argeo-suite-ui-rap-tp-unstable + argeo-suite-ui-rap-tp @@ -307,7 +307,7 @@ rpm - argeo-suite-ui-rap-tp-unstable + argeo-suite-ui-rap-tp ${version.argeo-tp} ${maven.build.timestamp} diff --git a/dep/pom.xml b/dep/pom.xml index d2ad0bb..dade9ed 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -6,7 +6,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. dep diff --git a/dist/argeo-suite-standard/pom.xml b/dist/argeo-suite-standard/pom.xml index 3eb2907..13d0c58 100644 --- a/dist/argeo-suite-standard/pom.xml +++ b/dist/argeo-suite-standard/pom.xml @@ -3,7 +3,7 @@ org.argeo.suite dist - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. argeo-suite-standard diff --git a/dist/pom.xml b/dist/pom.xml index f3d3d98..318eccf 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. dist diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml index bf6c422..01c8d3d 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.geo.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/environment/pom.xml b/environment/pom.xml index 7968186..1fc61bd 100644 --- a/environment/pom.xml +++ b/environment/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. environment diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml index d4a900b..6f725fa 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.support.geonames diff --git a/knowledge/org.argeo.support.odk/pom.xml b/knowledge/org.argeo.support.odk/pom.xml index 9156a31..76f855c 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.support.odk @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml index e39b9a5..f02a502 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.support.xforms @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/knowledge/pom.xml b/knowledge/pom.xml index 066ce3b..e5079d9 100644 --- a/knowledge/pom.xml +++ b/knowledge/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. knowledge diff --git a/lib/pom.xml b/lib/pom.xml index de0e32b..fc72c26 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -10,7 +10,7 @@ pom Parent POM for Argeo Suite Extensions - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT 2.1.27 @@ -18,7 +18,7 @@ 2.1.103 2.1.1 - /srv/rpmfactory/unstable/argeo + /srv/rpmfactory/testing/argeo @@ -30,7 +30,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT provided @@ -88,18 +88,6 @@ false - - argeo-unstable - http://forge.argeo.org/data/java/argeo-2.3/ - - true - never - warn - - - false - - diff --git a/library/org.argeo.library.ui/pom.xml b/library/org.argeo.library.ui/pom.xml index 6c50ff5..c34abc7 100644 --- a/library/org.argeo.library.ui/pom.xml +++ b/library/org.argeo.library.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite library - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.library.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/library/pom.xml b/library/pom.xml index 1472131..b1c4e2f 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. library diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml index ded3d2d..b96cf4c 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.people.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/people/pom.xml b/people/pom.xml index fe0abe0..c422ff7 100644 --- a/people/pom.xml +++ b/people/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. people diff --git a/pom.xml b/pom.xml index 2290b0b..7c1ba6d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT Argeo Suite pom http://www.argeo.org/ @@ -17,11 +17,11 @@ 2.1.27 2.1.13 - 2.1.104-SNAPSHOT + 2.1.103 2.1.1 - /srv/rpmfactory/unstable/argeo-osgi-2/argeo + /srv/rpmfactory/testing/argeo-osgi-2/argeo @@ -109,18 +109,6 @@ false - - argeo-unstable - http://forge.argeo.org/data/java/argeo-2.3/ - - true - never - warn - - - false - - @@ -192,7 +180,7 @@ staging - dav:https://forge.argeo.org/data/java/argeo-2.3 + dav:https://forge.argeo.org/data/java/argeo-2.1 false diff --git a/publishing/org.argeo.publishing.ui/pom.xml b/publishing/org.argeo.publishing.ui/pom.xml index 6a3ed5e..96a759e 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.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. org.argeo.publishing.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT diff --git a/publishing/pom.xml b/publishing/pom.xml index cbfe76a..2736015 100644 --- a/publishing/pom.xml +++ b/publishing/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.2-SNAPSHOT + 2.1.23-SNAPSHOT .. publishing