From: Mathieu Baudier Date: Wed, 24 Nov 2021 07:51:34 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/unstable' into testing X-Git-Tag: v2.1.24~7 X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=87a1cd9ab3159c01be43489f817224412daa0d42 Merge remote-tracking branch 'origin/unstable' into testing --- 87a1cd9ab3159c01be43489f817224412daa0d42 diff --cc .project index c9ab03f,3fcd2fd..ff41893 --- a/.project +++ b/.project @@@ -1,6 -1,6 +1,6 @@@ - argeo-suite-testing - argeo-suite-unstable ++ argeo-suite diff --cc cnf/build.bnd index 0000000,38f5f28..c59a50e mode 000000,100644..100644 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@@ -1,0 -1,3 +1,3 @@@ + -include: \ + ${workspace}/cnf/argeo.bnd, \ -${workspace}/cnf/unstable.bnd ++${workspace}/cnf/testing.bnd diff --cc cnf/maven.bnd index 0000000,f3a6e83..1b962bc mode 000000,100644..100644 --- a/cnf/maven.bnd +++ b/cnf/maven.bnd @@@ -1,0 -1,3 +1,3 @@@ + -include: \ + ../cnf/argeo.bnd, \ -../cnf/unstable.bnd ++../cnf/testing.bnd diff --cc cnf/testing.bnd index 0000000,0000000..b778569 new file mode 100644 --- /dev/null +++ b/cnf/testing.bnd @@@ -1,0 -1,0 +1,8 @@@ ++version.released=2.1.23 ++qualifier=.next ++ ++category=org.argeo.suite ++Bundle-RequiredExecutionEnvironment=JavaSE-11 ++ ++argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo ++argeo.rpm.suffix= diff --cc dep/org.argeo.suite.dep.e4.rap/pom.xml index 59dcf98,43ad96f..f4238b8 --- a/dep/org.argeo.suite.dep.e4.rap/pom.xml +++ b/dep/org.argeo.suite.dep.e4.rap/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.suite dep - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.suite.dep.e4.rap @@@ -15,7 -15,7 +15,7 @@@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT pom diff --cc dep/org.argeo.suite.dep.e4.rcp/pom.xml index 119d7a0,b4c4229..17b9ae3 --- a/dep/org.argeo.suite.dep.e4.rcp/pom.xml +++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml @@@ -6,7 -6,7 +6,7 @@@ org.argeo.suite dep - 2.1.23-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.suite.dep.e4.rcp diff --cc dep/org.argeo.suite.dep.ui.rap/pom.xml index 22c08d3,f52ecf1..1740dd3 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.suite dep - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.suite.dep.ui.rap @@@ -29,17 -29,17 +29,17 @@@ org.argeo.suite org.argeo.entity.api - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.entity.core - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.entity.ui - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT @@@ -53,67 -53,67 +53,67 @@@ org.argeo.suite org.argeo.suite.core - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.suite.ui - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.suite.theme.default - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.suite.ui.rap - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.people.ui - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.library.ui - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.geo.ui - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.publishing.ui - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.support.xforms - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.support.odk - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.suite org.argeo.support.geonames - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dep/pom.xml index 6be1672,5695608..d69eb9b --- a/dep/pom.xml +++ b/dep/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.suite argeo-suite - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. dep diff --cc dist/argeo-suite-standard/pom.xml index f847892,2f97b48..23c524b --- a/dist/argeo-suite-standard/pom.xml +++ b/dist/argeo-suite-standard/pom.xml @@@ -3,7 -3,7 +3,7 @@@ org.argeo.suite dist - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. argeo-suite-standard @@@ -25,7 -25,7 +25,7 @@@ rpm -- argeo-suite-standard-unstable ++ argeo-suite-standard${argeo.rpm.suffix} /etc/argeo.d/suite diff --cc dist/pom.xml index 3ea8f54,90ca6d2..dae809c --- a/dist/pom.xml +++ b/dist/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.suite argeo-suite - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. dist diff --cc lib/pom.xml index 7e15779,e00226e..5611ecf --- a/lib/pom.xml +++ b/lib/pom.xml @@@ -10,15 -10,12 +10,13 @@@ pom Parent POM for Argeo Suite Extensions - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT 2.1.27 - 2.3-SNAPSHOT - 2.3.1 + 2.1.13 - 2.1.103 ++ 2.1-SNAPSHOT + 2.1.1 - - /srv/rpmfactory/testing/argeo @@@ -30,7 -27,7 +28,7 @@@ org.argeo.suite org.argeo.suite.dep.ui.rap - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT provided diff --cc org.argeo.entity.api/pom.xml index 0000000,d20f3f6..c98575c mode 000000,100644..100644 --- a/org.argeo.entity.api/pom.xml +++ b/org.argeo.entity.api/pom.xml @@@ -1,0 -1,21 +1,21 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.entity.api + Entity API + jar + + + + org.argeo.commons + org.argeo.enterprise + ${version.argeo-commons} + + + diff --cc org.argeo.entity.core/pom.xml index 0000000,090ce00..a050945 mode 000000,100644..100644 --- a/org.argeo.entity.core/pom.xml +++ b/org.argeo.entity.core/pom.xml @@@ -1,0 -1,27 +1,27 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.entity.core + Entity Reference Implementation + jar + + + org.argeo.suite + org.argeo.entity.api - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.commons + org.argeo.cms + ${version.argeo-commons} + + + diff --cc org.argeo.entity.ui/pom.xml index 0000000,10c5918..d53f0d0 mode 000000,100644..100644 --- a/org.argeo.entity.ui/pom.xml +++ b/org.argeo.entity.ui/pom.xml @@@ -1,0 -1,43 +1,43 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.entity.ui + Entity UI + jar + + + org.argeo.suite + org.argeo.entity.core - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.commons + org.argeo.cms.ui + ${version.argeo-commons} + + + + + org.argeo.commons + org.argeo.eclipse.ui.rap + ${version.argeo-commons} + + + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + diff --cc org.argeo.geo.ui/pom.xml index 0000000,cfe3a0e..5677817 mode 000000,100644..100644 --- a/org.argeo.geo.ui/pom.xml +++ b/org.argeo.geo.ui/pom.xml @@@ -1,0 -1,37 +1,37 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.geo.ui + Geography UI + jar + + + org.argeo.suite + org.argeo.suite.ui - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + + org.argeo.commons + org.argeo.eclipse.ui.rap + ${version.argeo-commons} + provided + + + + diff --cc org.argeo.library.ui/pom.xml index 0000000,672634a..c7a67a8 mode 000000,100644..100644 --- a/org.argeo.library.ui/pom.xml +++ b/org.argeo.library.ui/pom.xml @@@ -1,0 -1,37 +1,37 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.library.ui + Documents UI + jar + + + org.argeo.suite + org.argeo.suite.ui - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + + org.argeo.commons + org.argeo.eclipse.ui.rap + ${version.argeo-commons} + provided + + + + diff --cc org.argeo.people.ui/pom.xml index 0000000,d211fc7..30c8eb8 mode 000000,100644..100644 --- a/org.argeo.people.ui/pom.xml +++ b/org.argeo.people.ui/pom.xml @@@ -1,0 -1,37 +1,37 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.people.ui + People UI + jar + + + org.argeo.suite + org.argeo.suite.ui - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + + org.argeo.commons + org.argeo.eclipse.ui.rap + ${version.argeo-commons} + provided + + + + diff --cc org.argeo.publishing.ui/pom.xml index 0000000,f26aeb4..5961833 mode 000000,100644..100644 --- a/org.argeo.publishing.ui/pom.xml +++ b/org.argeo.publishing.ui/pom.xml @@@ -1,0 -1,37 +1,37 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.publishing.ui + Publishing UI + jar + + + org.argeo.suite + org.argeo.suite.ui - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + + org.argeo.commons + org.argeo.eclipse.ui.rap + ${version.argeo-commons} + provided + + + + diff --cc org.argeo.suite.core/pom.xml index 0000000,e7402fc..b075044 mode 000000,100644..100644 --- a/org.argeo.suite.core/pom.xml +++ b/org.argeo.suite.core/pom.xml @@@ -1,0 -1,32 +1,32 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.suite.core + Suite Core + jar + + + org.argeo.suite + org.argeo.entity.core - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.commons + org.argeo.cms + ${version.argeo-commons} + + + org.argeo.commons + org.argeo.maintenance + ${version.argeo-commons} + + + diff --cc org.argeo.suite.theme.default/pom.xml index 0000000,f2927dc..be49f36 mode 000000,100644..100644 --- a/org.argeo.suite.theme.default/pom.xml +++ b/org.argeo.suite.theme.default/pom.xml @@@ -1,0 -1,15 +1,15 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.suite.theme.default + Suite Default Theme + jar + + + diff --cc org.argeo.suite.ui.rap/pom.xml index 0000000,f1f2d83..837a369 mode 000000,100644..100644 --- a/org.argeo.suite.ui.rap/pom.xml +++ b/org.argeo.suite.ui.rap/pom.xml @@@ -1,0 -1,29 +1,29 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.suite.ui.rap + Suite UI RAP + jar + + + org.argeo.suite + org.argeo.suite.ui - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + diff --cc org.argeo.suite.ui/pom.xml index 0000000,b5d1b2a..54b6b6f mode 000000,100644..100644 --- a/org.argeo.suite.ui/pom.xml +++ b/org.argeo.suite.ui/pom.xml @@@ -1,0 -1,47 +1,47 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.suite.ui + Suite UI + jar + + + org.argeo.suite + org.argeo.suite.core - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + org.argeo.suite + org.argeo.entity.ui - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + + + org.argeo.commons + org.argeo.eclipse.ui + ${version.argeo-commons} + + + org.argeo.commons + org.argeo.eclipse.ui.rap + ${version.argeo-commons} + provided + + + + + org.argeo.tp + argeo-tp-rap-e4 + ${version.argeo-tp} + pom + provided + + + diff --cc org.argeo.support.geonames/pom.xml index 0000000,ce70b50..3a1e5f3 mode 000000,100644..100644 --- a/org.argeo.support.geonames/pom.xml +++ b/org.argeo.support.geonames/pom.xml @@@ -1,0 -1,20 +1,20 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.support.geonames + Geonames support + jar + + + org.argeo.commons + org.argeo.cms + ${version.argeo-commons} + + + diff --cc org.argeo.support.odk/pom.xml index 0000000,2f97176..0379dd4 mode 000000,100644..100644 --- a/org.argeo.support.odk/pom.xml +++ b/org.argeo.support.odk/pom.xml @@@ -1,0 -1,25 +1,25 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.support.odk + ODK support + jar + + + org.argeo.suite + org.argeo.suite.core - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + org.argeo.suite + org.argeo.support.xforms - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + diff --cc org.argeo.support.xforms/pom.xml index 0000000,08149b1..9d59314 mode 000000,100644..100644 --- a/org.argeo.support.xforms/pom.xml +++ b/org.argeo.support.xforms/pom.xml @@@ -1,0 -1,20 +1,20 @@@ + + + 4.0.0 + + org.argeo.suite + argeo-suite - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + .. + + org.argeo.support.xforms + XForms support + jar + + + org.argeo.suite + org.argeo.suite.core - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT + + + diff --cc pom.xml index c982334,5e094f2..b6dd237 --- a/pom.xml +++ b/pom.xml @@@ -7,19 -7,17 +7,17 @@@ org.argeo.suite argeo-suite - 2.1.24-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT Argeo Suite pom http://www.argeo.org/ - unstable ++ testing 2.1.27 - 2.1.13 - 2.1.104-SNAPSHOT - - 2.3-SNAPSHOT - 2.3.1 - ++ 2.1-SNAPSHOT + 2.1.1 - - /srv/rpmfactory/testing/argeo-osgi-2/argeo ++