From: Mathieu Baudier Date: Sat, 13 Nov 2021 08:32:47 +0000 (+0100) Subject: Merge branch 'master' into testing X-Git-Tag: v2.1.104~10 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=98c795d0ee9295da8e28d6069fe3d06f6bc3f89f Merge branch 'master' into testing --- 98c795d0ee9295da8e28d6069fe3d06f6bc3f89f diff --cc cnf/build.bnd index 150e1d46a,af9c91be7..f39af41a1 --- a/cnf/build.bnd +++ b/cnf/build.bnd @@@ -1,18 -1,4 +1,4 @@@ - category: org.argeo.commons - version: 2.1.104 - buildId: S - #buildId: r${tstamp} - - Bundle-Version: 2.1.104.S - Bundle-RequiredExecutionEnvironment: JavaSE-11 - - Private-Package: org.argeo.*.internal.* - Export-Package: !org.argeo.*.internal.*; org.argeo.* - SLC-Category: ${category} - #SLC-Build-Timestamp: ${tstamp} - -savemanifest = META-INF/MANIFEST.MF - -removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By - -groupId = ${category} - Automatic-Module-Name: ${bsn} - - + -include: \ -${workspace}/cnf/unstable.bnd, \ ++${workspace}/cnf/testing.bnd, \ + ${workspace}/cnf/argeo.bnd, \ + -${workspace}/cnf/release.bnd diff --cc cnf/maven.bnd index 000000000,bbd72adec..05b92033a mode 000000,100644..100644 --- a/cnf/maven.bnd +++ b/cnf/maven.bnd @@@ -1,0 -1,3 +1,3 @@@ + -include: \ -../cnf/unstable.bnd, \ ++../cnf/testing.bnd, \ + ../cnf/argeo.bnd diff --cc cnf/testing.bnd index 000000000,000000000..0f1c92e4d new file mode 100644 --- /dev/null +++ b/cnf/testing.bnd @@@ -1,0 -1,0 +1,6 @@@ ++category=org.argeo.commons ++version.released=2.1.104 ++Bundle-RequiredExecutionEnvironment=JavaSE-11 ++ ++argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo ++argeo.rpm.suffix= diff --cc demo/pom.xml index 97a5dcef7,f152523a1..22d23f847 --- a/demo/pom.xml +++ b/demo/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. demo @@@ -20,7 -20,7 +20,7 @@@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT @@@ -42,7 -42,7 +42,7 @@@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT @@@ -64,7 -64,7 +64,7 @@@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dep/org.argeo.dep.cms.client/pom.xml index 81a2fa76e,975257ba9..d7354d9ad --- a/dep/org.argeo.dep.cms.client/pom.xml +++ b/dep/org.argeo.dep.cms.client/pom.xml @@@ -3,7 -3,7 +3,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dep .. @@@ -15,17 -15,17 +15,17 @@@ org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT @@@ -234,7 -234,7 +234,7 @@@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT test diff --cc dep/org.argeo.dep.cms.e4.rap/pom.xml index ff12645c6,a5f1bd42f..df05ac93a --- a/dep/org.argeo.dep.cms.e4.rap/pom.xml +++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml @@@ -3,7 -3,7 +3,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dep .. @@@ -15,7 -15,7 +15,7 @@@ org.argeo.commons org.argeo.dep.cms.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT pom @@@ -23,12 -23,12 +23,12 @@@ org.argeo.commons org.argeo.cms.e4 - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.e4.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dep/org.argeo.dep.cms.ext/pom.xml index f657231f4,c53d9ba67..3749a9f8e --- a/dep/org.argeo.dep.cms.ext/pom.xml +++ b/dep/org.argeo.dep.cms.ext/pom.xml @@@ -5,7 -5,7 +5,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dep .. diff --cc dep/org.argeo.dep.cms.node/pom.xml index 1174ddf97,2832da464..656da2955 --- a/dep/org.argeo.dep.cms.node/pom.xml +++ b/dep/org.argeo.dep.cms.node/pom.xml @@@ -3,7 -3,7 +3,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dep .. @@@ -15,7 -15,7 +15,7 @@@ org.argeo.commons org.argeo.dep.cms.client - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT pom @@@ -23,17 -23,17 +23,17 @@@ org.argeo.commons org.argeo.api - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.cms - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dep/org.argeo.dep.cms.ui.rap/pom.xml index 064ca8703,03249c591..b00284f4f --- a/dep/org.argeo.dep.cms.ui.rap/pom.xml +++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml @@@ -3,7 -3,7 +3,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dep .. @@@ -15,7 -15,7 +15,7 @@@ org.argeo.commons org.argeo.dep.cms.node - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT pom @@@ -49,27 -49,27 +49,27 @@@ org.argeo.commons org.argeo.eclipse.ui - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui.theme - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dep/pom.xml index 3293a560c,98547404f..7c3b04cb6 --- a/dep/pom.xml +++ b/dep/pom.xml @@@ -4,7 -6,7 +6,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. dep @@@ -93,7 -120,7 +120,7 @@@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT test diff --cc dist/argeo-cli/pom.xml index 29ec5f575,ea59e43c3..4d2aa70c0 --- a/dist/argeo-cli/pom.xml +++ b/dist/argeo-cli/pom.xml @@@ -2,7 -2,7 +2,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dist .. @@@ -16,12 -16,12 +16,12 @@@ org.argeo.commons org.argeo.dep.cms.client - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dist/argeo-node/pom.xml index 452e8379c,dda7589b9..10be1edb5 --- a/dist/argeo-node/pom.xml +++ b/dist/argeo-node/pom.xml @@@ -2,7 -2,7 +2,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dist .. @@@ -16,23 -16,23 +16,23 @@@ org.argeo.commons org.argeo.dep.cms.client - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.e4.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons osgi-boot zip - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dist/containers/pom.xml index fc92e2c6c,2c7f6bfcc..cc3242537 --- a/dist/containers/pom.xml +++ b/dist/containers/pom.xml @@@ -2,7 -2,7 +2,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dist .. diff --cc dist/osgi-boot/pom.xml index d339ed5d2,06970e72b..239f3688c --- a/dist/osgi-boot/pom.xml +++ b/dist/osgi-boot/pom.xml @@@ -2,7 -2,7 +2,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT dist .. @@@ -23,7 -23,7 +23,7 @@@ org.argeo.commons org.argeo.osgi.boot - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc dist/pom.xml index f6f87860d,388b1bcdc..52ed45d55 --- a/dist/pom.xml +++ b/dist/pom.xml @@@ -4,7 -6,7 +6,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. dist diff --cc org.argeo.api/pom.xml index d7f018883,efd1bed6b..8f3c15c57 --- a/org.argeo.api/pom.xml +++ b/org.argeo.api/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.api diff --cc org.argeo.cms.e4.rap/pom.xml index f1ec50191,7f5269876..81f2fcacc --- a/org.argeo.cms.e4.rap/pom.xml +++ b/org.argeo.cms.e4.rap/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.cms.e4.rap @@@ -14,18 -14,18 +14,18 @@@ org.argeo.commons org.argeo.cms.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.e4 - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT provided diff --cc org.argeo.cms.e4/pom.xml index 24a386afe,ae12564c5..fd1842afd --- a/org.argeo.cms.e4/pom.xml +++ b/org.argeo.cms.e4/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.cms.e4 @@@ -14,14 -14,14 +14,14 @@@ org.argeo.commons org.argeo.cms.ui - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT provided diff --cc org.argeo.cms.ui.rap/pom.xml index 8f5df3373,b38871cc2..37fdd9a17 --- a/org.argeo.cms.ui.rap/pom.xml +++ b/org.argeo.cms.ui.rap/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.cms.ui.rap @@@ -14,13 -14,13 +14,13 @@@ org.argeo.commons org.argeo.cms.ui - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT provided @@@ -28,7 -28,7 +28,7 @@@ org.argeo.commons org.argeo.cms.ui.theme - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc org.argeo.cms.ui.theme/pom.xml index e11b0655a,be47b820a..b30460a81 --- a/org.argeo.cms.ui.theme/pom.xml +++ b/org.argeo.cms.ui.theme/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.cms.ui.theme diff --cc org.argeo.cms.ui/pom.xml index af0ea3e2f,60eb6203f..186bb1e5b --- a/org.argeo.cms.ui/pom.xml +++ b/org.argeo.cms.ui/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.cms.ui @@@ -14,13 -14,13 +14,13 @@@ org.argeo.commons org.argeo.cms - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT provided @@@ -28,7 -28,7 +28,7 @@@ org.argeo.commons org.argeo.cms.ui.theme - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc org.argeo.cms/pom.xml index 351ed5391,e19f92e01..45aaa917e --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.cms @@@ -14,27 -14,27 +14,27 @@@ org.argeo.commons org.argeo.api - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc org.argeo.core/pom.xml index c5a35ccb7,37d89574d..b1dfe92c6 --- a/org.argeo.core/pom.xml +++ b/org.argeo.core/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.core @@@ -13,12 -13,12 +13,12 @@@ org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc org.argeo.eclipse.ui.rap/pom.xml index b3c1b75bf,8b728c16c..e56d4395b --- a/org.argeo.eclipse.ui.rap/pom.xml +++ b/org.argeo.eclipse.ui.rap/pom.xml @@@ -3,7 -3,7 +3,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT argeo-commons .. @@@ -13,7 -13,7 +13,7 @@@ org.argeo.commons org.argeo.eclipse.ui - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc org.argeo.eclipse.ui/pom.xml index 34639d810,1574da881..e3069dd37 --- a/org.argeo.eclipse.ui/pom.xml +++ b/org.argeo.eclipse.ui/pom.xml @@@ -3,7 -3,7 +3,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT argeo-commons .. @@@ -18,7 -18,7 +18,7 @@@ org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc org.argeo.enterprise/pom.xml index 18701b219,7a3677206..fef408449 --- a/org.argeo.enterprise/pom.xml +++ b/org.argeo.enterprise/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.enterprise diff --cc org.argeo.jcr/pom.xml index ae4e0bc04,d8d74920f..99becb52e --- a/org.argeo.jcr/pom.xml +++ b/org.argeo.jcr/pom.xml @@@ -3,7 -3,7 +3,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.jcr diff --cc org.argeo.maintenance/pom.xml index 407855443,b33e47dfc..b061f87cd --- a/org.argeo.maintenance/pom.xml +++ b/org.argeo.maintenance/pom.xml @@@ -4,7 -4,7 +4,7 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT .. org.argeo.maintenance @@@ -14,22 -14,22 +14,22 @@@ org.argeo.commons org.argeo.jcr - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT org.argeo.commons org.argeo.api - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT diff --cc org.argeo.osgi.boot/pom.xml index 1c870e88c,33a858d3a..1bf95002e --- a/org.argeo.osgi.boot/pom.xml +++ b/org.argeo.osgi.boot/pom.xml @@@ -3,7 -3,7 +3,7 @@@ 4.0.0 org.argeo.commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT argeo-commons .. diff --cc pom.xml index 96886f01b,cea1b52df..c39b91270 --- a/pom.xml +++ b/pom.xml @@@ -8,14 -8,13 +8,13 @@@ org.argeo.commons argeo-commons - 2.1.104-SNAPSHOT - 2.3-SNAPSHOT ++ 2.1-SNAPSHOT Argeo Commons pom http://www.argeo.org/ - unstable ++ testing 2.1.27 - - /srv/rpmfactory/testing/argeo-osgi-2/argeo code.argeo.org @@@ -41,6 -40,6 +40,7 @@@ dep demo dist ++ sdk scm:git:http://git.argeo.org/lgpl/argeo-commons.git