From: Mathieu Baudier Date: Mon, 3 May 2021 07:09:55 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into v2.x X-Git-Tag: argeo-commons-2.1.103~24 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=25840df4d2ad60af53487116cdd98fa27937f91b;hp=cdc0e2725f4ec174309c3fdcd060f80753210c00 Merge remote-tracking branch 'origin/master' into v2.x Conflicts: demo/pom.xml dep/org.argeo.dep.cms.client/pom.xml dep/org.argeo.dep.cms.e4.rap/pom.xml dep/org.argeo.dep.cms.node/pom.xml dep/org.argeo.dep.cms.sdk/pom.xml dep/org.argeo.dep.cms.ui.rap/pom.xml dep/pom.xml dist/argeo-cli/pom.xml dist/argeo-node/pom.xml dist/containers/pom.xml dist/osgi-boot/pom.xml dist/pom.xml org.argeo.api/pom.xml org.argeo.cms.e4.rap/pom.xml org.argeo.cms.e4/pom.xml org.argeo.cms.ui.rap/pom.xml org.argeo.cms.ui.theme/pom.xml org.argeo.cms.ui/pom.xml org.argeo.cms/pom.xml org.argeo.core/pom.xml org.argeo.eclipse.ui.rap/pom.xml org.argeo.eclipse.ui/pom.xml org.argeo.enterprise/pom.xml org.argeo.jcr/pom.xml org.argeo.maintenance/pom.xml org.argeo.osgi.boot/pom.xml pom.xml --- diff --git a/demo/pom.xml b/demo/pom.xml index 40855213e..c720916ce 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. demo @@ -20,7 +20,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT @@ -42,7 +42,7 @@ org.argeo.commons org.argeo.dep.cms.sdk - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT @@ -64,7 +64,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml index 0aace45e1..3a90a08dd 100644 --- a/dep/org.argeo.dep.cms.client/pom.xml +++ b/dep/org.argeo.dep.cms.client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dep .. @@ -15,17 +15,17 @@ org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.core - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT @@ -234,7 +234,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT test diff --git a/dep/org.argeo.dep.cms.e4.rap/pom.xml b/dep/org.argeo.dep.cms.e4.rap/pom.xml index c98015106..aced98d8b 100644 --- a/dep/org.argeo.dep.cms.e4.rap/pom.xml +++ b/dep/org.argeo.dep.cms.e4.rap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT pom @@ -23,12 +23,12 @@ org.argeo.commons org.argeo.cms.e4 - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index 1e48b0d23..fda8e9918 100644 --- a/dep/org.argeo.dep.cms.node/pom.xml +++ b/dep/org.argeo.dep.cms.node/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT pom @@ -23,17 +23,17 @@ org.argeo.commons org.argeo.api - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.cms - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml index d752f9850..dc0c644df 100644 --- a/dep/org.argeo.dep.cms.sdk/pom.xml +++ b/dep/org.argeo.dep.cms.sdk/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dep .. @@ -14,7 +14,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT pom @@ -23,7 +23,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT test diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml index 7f601f511..92c83f309 100644 --- a/dep/org.argeo.dep.cms.ui.rap/pom.xml +++ b/dep/org.argeo.dep.cms.ui.rap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.node - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT pom @@ -49,27 +49,27 @@ org.argeo.commons org.argeo.eclipse.ui - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.cms.ui - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.cms.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.cms.ui.theme - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/dep/pom.xml b/dep/pom.xml index 0d0c750ae..87799a67a 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. dep @@ -93,7 +93,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT test diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml index 6137352ec..96b7049cc 100644 --- a/dist/argeo-cli/pom.xml +++ b/dist/argeo-cli/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dist .. @@ -16,12 +16,12 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml index b0f9aa268..88d7a3837 100644 --- a/dist/argeo-node/pom.xml +++ b/dist/argeo-node/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dist .. @@ -16,28 +16,28 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.dep.cms.sdk - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons osgi-boot zip - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/dist/containers/pom.xml b/dist/containers/pom.xml index 907e51956..1e67cdd1b 100644 --- a/dist/containers/pom.xml +++ b/dist/containers/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dist .. diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml index 6d4c96f08..c03046c3f 100644 --- a/dist/osgi-boot/pom.xml +++ b/dist/osgi-boot/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT dist .. @@ -23,7 +23,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/dist/pom.xml b/dist/pom.xml index 898c8aa42..7a179fd57 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. dist diff --git a/org.argeo.api/pom.xml b/org.argeo.api/pom.xml index b2901a21e..32862b4cb 100644 --- a/org.argeo.api/pom.xml +++ b/org.argeo.api/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.api diff --git a/org.argeo.cms.e4.rap/pom.xml b/org.argeo.cms.e4.rap/pom.xml index 442f50456..e64184949 100644 --- a/org.argeo.cms.e4.rap/pom.xml +++ b/org.argeo.cms.e4.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.cms.e4.rap @@ -14,18 +14,18 @@ org.argeo.commons org.argeo.cms.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.cms.e4 - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT provided diff --git a/org.argeo.cms.e4/pom.xml b/org.argeo.cms.e4/pom.xml index cb89d9951..1d0de1a26 100644 --- a/org.argeo.cms.e4/pom.xml +++ b/org.argeo.cms.e4/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.cms.e4 @@ -14,14 +14,14 @@ org.argeo.commons org.argeo.cms.ui - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT provided diff --git a/org.argeo.cms.ui.rap/pom.xml b/org.argeo.cms.ui.rap/pom.xml index 14ee8b4a9..a6a493cd2 100644 --- a/org.argeo.cms.ui.rap/pom.xml +++ b/org.argeo.cms.ui.rap/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.cms.ui.rap @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms.ui - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/org.argeo.cms.ui.theme/pom.xml b/org.argeo.cms.ui.theme/pom.xml index 100a8aa6f..da63793d6 100644 --- a/org.argeo.cms.ui.theme/pom.xml +++ b/org.argeo.cms.ui.theme/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.cms.ui.theme diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml index 9d9b7ece7..ec8521e63 100644 --- a/org.argeo.cms.ui/pom.xml +++ b/org.argeo.cms.ui/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.cms.ui @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 3348d2afe..5aa045e77 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.cms @@ -14,27 +14,27 @@ org.argeo.commons org.argeo.api - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.core - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml index ebd6f54fb..a37243f5b 100644 --- a/org.argeo.core/pom.xml +++ b/org.argeo.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.core @@ -13,12 +13,12 @@ org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml index f6ce04bb1..fb65509f4 100644 --- a/org.argeo.eclipse.ui.rap/pom.xml +++ b/org.argeo.eclipse.ui.rap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT argeo-commons .. @@ -13,7 +13,7 @@ org.argeo.commons org.argeo.eclipse.ui - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml index 27e267623..3f771750d 100644 --- a/org.argeo.eclipse.ui/pom.xml +++ b/org.argeo.eclipse.ui/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT argeo-commons .. @@ -18,7 +18,7 @@ org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml index b2b3d2e4f..86ac8659f 100644 --- a/org.argeo.enterprise/pom.xml +++ b/org.argeo.enterprise/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.enterprise diff --git a/org.argeo.jcr/pom.xml b/org.argeo.jcr/pom.xml index 42bcd8a67..55e540e25 100644 --- a/org.argeo.jcr/pom.xml +++ b/org.argeo.jcr/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.jcr diff --git a/org.argeo.maintenance/pom.xml b/org.argeo.maintenance/pom.xml index f1114291a..f790ae62c 100644 --- a/org.argeo.maintenance/pom.xml +++ b/org.argeo.maintenance/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT .. org.argeo.maintenance @@ -14,22 +14,22 @@ org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.core - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT org.argeo.commons org.argeo.api - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml index 21ad3bf0e..f2c874b59 100644 --- a/org.argeo.osgi.boot/pom.xml +++ b/org.argeo.osgi.boot/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT argeo-commons .. diff --git a/pom.xml b/pom.xml index 5a1b188c0..2d3043335 100644 --- a/pom.xml +++ b/pom.xml @@ -8,14 +8,14 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.103-SNAPSHOT Argeo Commons pom http://www.argeo.org/ 2.1.27 - /srv/rpmfactory/unstable/argeo-osgi-2/argeo + /srv/rpmfactory/testing/argeo-osgi-2/argeo code.argeo.org @@ -120,12 +120,12 @@ staging - dav:https://forge.argeo.org/data/java/argeo-2.3 + dav:https://forge.argeo.org/data/java/argeo-2.1/ false staging - file:///srv/docfactory/argeo-2.3/site/argeo-commons/ + file:///srv/docfactory/argeo-2.1/site/argeo-commons/ @@ -141,18 +141,6 @@ false - - argeo-unstable - http://forge.argeo.org/data/java/argeo-2.3/ - - true - never - warn - - - false - - central @@ -238,7 +226,7 @@ argeo - http://localhost:7080/data/java/argeo-2.3 + http://localhost:7080/data/java/argeo-2.1 true daily @@ -249,7 +237,7 @@ staging - dav:http://localhost:7080/data/java/argeo-2.3/ + dav:http://localhost:7080/data/java/argeo-2.1/ false