From: Mathieu Baudier Date: Sun, 7 Feb 2021 12:12:31 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into v2.x X-Git-Tag: argeo-suite-2.1.19~4 X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=bf2b76df49da4a94e37d539ef15d676a9fa58359;hp=3523f6ae47201064ca7393ea2f476a81ff4e4728 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 c0723fe..ed4ab92 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.entity.api diff --git a/core/org.argeo.entity.core/pom.xml b/core/org.argeo.entity.core/pom.xml index 39b697e..fdc2954 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.entity.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.api - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/core/org.argeo.entity.ui/pom.xml b/core/org.argeo.entity.ui/pom.xml index d635fbf..e10fe14 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.entity.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/core/org.argeo.suite.core/pom.xml b/core/org.argeo.suite.core/pom.xml index 0c1d40b..3ae4e8b 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.suite.core @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.entity.core - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/core/org.argeo.suite.theme.default/pom.xml b/core/org.argeo.suite.theme.default/pom.xml index e9f0092..a96e81f 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.1-SNAPSHOT + 2.1.19-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 a8a1e80..1c667d4 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.suite.ui.rap @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/core/org.argeo.suite.ui/pom.xml b/core/org.argeo.suite.ui/pom.xml index 2436864..2ba2369 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.suite.ui @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index a8ef5a0..6b1affc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-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 30ff3b6..f853370 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.suite.dep.e4.rap @@ -15,7 +15,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.3.1-SNAPSHOT + 2.1.19-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 d801236..bf17de3 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.suite.dep.ui.rap @@ -15,84 +15,84 @@ org.argeo.suite org.argeo.entity.api - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.entity.core - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.suite.core - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.suite.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.suite.theme.default - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.suite.ui.rap - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.people.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.documents.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.geo.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.publishing.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.support.odk - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.support.geonames - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/dep/pom.xml b/dep/pom.xml index 60dc034..192d3f1 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. dep diff --git a/dist/argeo-office/pom.xml b/dist/argeo-office/pom.xml index dc4c578..cead30a 100644 --- a/dist/argeo-office/pom.xml +++ b/dist/argeo-office/pom.xml @@ -3,7 +3,7 @@ org.argeo.suite dist - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. argeo-office @@ -28,7 +28,7 @@ org.argeo.suite org.argeo.suite.dep.e4.rap - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.commons diff --git a/dist/argeo-suite-demo/pom.xml b/dist/argeo-suite-demo/pom.xml index c31fc7d..03e821d 100644 --- a/dist/argeo-suite-demo/pom.xml +++ b/dist/argeo-suite-demo/pom.xml @@ -3,7 +3,7 @@ org.argeo.suite dist - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. argeo-suite-demo diff --git a/dist/pom.xml b/dist/pom.xml index 38c2521..387c4dc 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. dist diff --git a/environment/org.argeo.geo.ui/pom.xml b/environment/org.argeo.geo.ui/pom.xml index a5a4711..e50e7c3 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.geo.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/environment/pom.xml b/environment/pom.xml index 7e13702..5927117 100644 --- a/environment/pom.xml +++ b/environment/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. environment diff --git a/knowledge/org.argeo.support.geonames/pom.xml b/knowledge/org.argeo.support.geonames/pom.xml index 7587ef3..00c5ea4 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.support.geonames diff --git a/knowledge/org.argeo.support.odk/pom.xml b/knowledge/org.argeo.support.odk/pom.xml index 2b68347..49e1fda 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.support.odk @@ -14,12 +14,12 @@ org.argeo.suite org.argeo.suite.core - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/knowledge/org.argeo.support.xforms/pom.xml b/knowledge/org.argeo.support.xforms/pom.xml index d97f8c7..680451c 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.support.xforms @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.core - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/knowledge/pom.xml b/knowledge/pom.xml index 6a0890e..3db90ec 100644 --- a/knowledge/pom.xml +++ b/knowledge/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. knowledge diff --git a/lib/pom.xml b/lib/pom.xml index 2597436..8713ec1 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -10,14 +10,14 @@ pom Parent POM for Argeo Suite Extensions - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT 2.1.27 2.1.13 - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT - /srv/rpmfactory/unstable/argeo + /srv/rpmfactory/testing/argeo @@ -29,7 +29,7 @@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT provided @@ -91,18 +91,6 @@ false - - argeo-unstable - http://forge.argeo.org/data/java/argeo-2.3/ - - true - never - warn - - - false - - @@ -171,4 +159,8 @@ + + + v2.x + diff --git a/library/org.argeo.documents.ui/pom.xml b/library/org.argeo.documents.ui/pom.xml index 2c59ff3..a611a6d 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.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.documents.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/library/pom.xml b/library/pom.xml index ea3ef63..fcd4e83 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. library diff --git a/people/org.argeo.people.ui/pom.xml b/people/org.argeo.people.ui/pom.xml index 07589a4..9cd9833 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.people.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/people/pom.xml b/people/pom.xml index 193f633..6839d7b 100644 --- a/people/pom.xml +++ b/people/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. people diff --git a/pom.xml b/pom.xml index 7626c1c..fcb8d3d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT Argeo Suite pom http://www.argeo.org/ @@ -17,9 +17,9 @@ 2.1.27 2.1.13 - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT - /srv/rpmfactory/unstable/argeo-osgi-2/argeo + /srv/rpmfactory/testing/argeo-osgi-2/argeo @@ -40,7 +40,7 @@ scm:git:http://git.argeo.org/gpl/argeo-suite.git http://git.argeo.org/?p=gpl/argeo-suite.git;a=summary scm:git:https://code.argeo.org/git/gpl/argeo-suite.git - HEAD + v2.x Argeo GmbH @@ -107,18 +107,6 @@ false - - argeo-unstable - http://forge.argeo.org/data/java/argeo-2.3/ - - true - never - warn - - - false - - @@ -190,7 +178,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 b70057c..13ff942 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.1-SNAPSHOT + 2.1.19-SNAPSHOT .. org.argeo.publishing.ui @@ -14,7 +14,7 @@ org.argeo.suite org.argeo.suite.ui - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT diff --git a/publishing/pom.xml b/publishing/pom.xml index 5dfdd44..3ac25f6 100644 --- a/publishing/pom.xml +++ b/publishing/pom.xml @@ -4,7 +4,7 @@ org.argeo.suite argeo-suite - 2.3.1-SNAPSHOT + 2.1.19-SNAPSHOT .. publishing