From: Mathieu Baudier Date: Sun, 7 Feb 2021 12:12:18 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into v2.x X-Git-Tag: argeo-commons-2.1.101~3 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=5b3fde2e47cfa0edb507ff0829c9346efad48d14;hp=45a6a870ffbd65a853c890b12645fb372cfe92d1 Merge remote-tracking branch 'origin/master' into v2.x --- diff --git a/demo/pom.xml b/demo/pom.xml index 40855213e..8637d7337 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT .. demo @@ -20,7 +20,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT @@ -42,7 +42,7 @@ org.argeo.commons org.argeo.dep.cms.sdk - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT @@ -64,7 +64,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml index 0aace45e1..fcb73e255 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.101-SNAPSHOT dep .. @@ -15,17 +15,17 @@ org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.core - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT @@ -234,7 +234,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.101-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..a3b843d01 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.101-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT pom @@ -23,12 +23,12 @@ org.argeo.commons org.argeo.cms.e4 - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index 1e48b0d23..febf55a02 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.101-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT pom @@ -23,17 +23,17 @@ org.argeo.commons org.argeo.api - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.cms - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml index d752f9850..45a6259d9 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.101-SNAPSHOT dep .. @@ -14,7 +14,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT pom @@ -23,7 +23,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.101-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..d1831d631 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.101-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.node - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT pom @@ -49,27 +49,27 @@ org.argeo.commons org.argeo.eclipse.ui - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.cms.ui - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.cms.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.cms.ui.theme - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/dep/pom.xml b/dep/pom.xml index 0d0c750ae..fa9fdf98b 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT .. dep @@ -93,7 +93,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT test diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml index 6137352ec..3eec6e6b9 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.101-SNAPSHOT dist .. @@ -16,12 +16,12 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml index b0f9aa268..0f29d7615 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.101-SNAPSHOT dist .. @@ -16,28 +16,28 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.dep.cms.sdk - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons osgi-boot zip - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/dist/containers/pom.xml b/dist/containers/pom.xml index 907e51956..f318f9623 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.101-SNAPSHOT dist .. diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml index 6d4c96f08..21b55f82d 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.101-SNAPSHOT dist .. @@ -23,7 +23,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/dist/pom.xml b/dist/pom.xml index 898c8aa42..8c539afbe 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT .. dist diff --git a/org.argeo.api/pom.xml b/org.argeo.api/pom.xml index b2901a21e..75f651512 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.101-SNAPSHOT .. org.argeo.api diff --git a/org.argeo.cms.e4.rap/pom.xml b/org.argeo.cms.e4.rap/pom.xml index 442f50456..77db41f31 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.101-SNAPSHOT .. org.argeo.cms.e4.rap @@ -14,18 +14,18 @@ org.argeo.commons org.argeo.cms.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.cms.e4 - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT provided diff --git a/org.argeo.cms.e4/pom.xml b/org.argeo.cms.e4/pom.xml index cb89d9951..dc8d690e2 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.101-SNAPSHOT .. org.argeo.cms.e4 @@ -14,14 +14,14 @@ org.argeo.commons org.argeo.cms.ui - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT provided diff --git a/org.argeo.cms.ui.rap/pom.xml b/org.argeo.cms.ui.rap/pom.xml index 14ee8b4a9..27de13e04 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.101-SNAPSHOT .. org.argeo.cms.ui.rap @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms.ui - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/org.argeo.cms.ui.theme/pom.xml b/org.argeo.cms.ui.theme/pom.xml index 100a8aa6f..e9219c73e 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.101-SNAPSHOT .. org.argeo.cms.ui.theme diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml index 9d9b7ece7..4c0a8dae0 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.101-SNAPSHOT .. org.argeo.cms.ui @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 3348d2afe..541492735 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.101-SNAPSHOT .. org.argeo.cms @@ -14,27 +14,27 @@ org.argeo.commons org.argeo.api - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.core - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml index ebd6f54fb..289728f36 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.101-SNAPSHOT .. org.argeo.core @@ -13,12 +13,12 @@ org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.101-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..1ad527cac 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.101-SNAPSHOT argeo-commons .. @@ -13,7 +13,7 @@ org.argeo.commons org.argeo.eclipse.ui - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml index 27e267623..e2f1e4df3 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.101-SNAPSHOT argeo-commons .. @@ -18,7 +18,7 @@ org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml index b2b3d2e4f..2345a1ab5 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.101-SNAPSHOT .. org.argeo.enterprise diff --git a/org.argeo.jcr/pom.xml b/org.argeo.jcr/pom.xml index 42bcd8a67..c3d628f55 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.101-SNAPSHOT .. org.argeo.jcr diff --git a/org.argeo.maintenance/pom.xml b/org.argeo.maintenance/pom.xml index f1114291a..2a5483346 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.101-SNAPSHOT .. org.argeo.maintenance @@ -14,22 +14,22 @@ org.argeo.commons org.argeo.jcr - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.core - 2.3.1-SNAPSHOT + 2.1.101-SNAPSHOT org.argeo.commons org.argeo.api - 2.3.1-SNAPSHOT + 2.1.101-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..1f4d15cf7 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.101-SNAPSHOT argeo-commons .. diff --git a/pom.xml b/pom.xml index 5a1b188c0..ffc14f786 100644 --- a/pom.xml +++ b/pom.xml @@ -8,14 +8,14 @@ org.argeo.commons argeo-commons - 2.3.1-SNAPSHOT + 2.1.101-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