From: Mathieu Baudier Date: Wed, 24 Nov 2021 06:41:29 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/unstable' into testing X-Git-Tag: v2.1.104~4 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=f7a2e63cf5356cfbf5ccc984d181b97ce31a4656;hp=4c904fca1f366843e4c8584a302d594abdc96084;p=lgpl%2Fargeo-commons.git Merge remote-tracking branch 'origin/unstable' into testing --- diff --git a/.project b/.project index c006088ca..2bb4833a3 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - argeo-commons-unstable + argeo-commons diff --git a/cnf/testing.bnd b/cnf/testing.bnd new file mode 100644 index 000000000..0a43c20de --- /dev/null +++ b/cnf/testing.bnd @@ -0,0 +1,8 @@ +version.released=2.1.103 +qualifier=.next + +category=org.argeo.commons +Bundle-RequiredExecutionEnvironment=JavaSE-11 + +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo +argeo.rpm.suffix= diff --git a/demo/pom.xml b/demo/pom.xml index f152523a1..22d23f847 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. demo @@ -20,7 +20,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3-SNAPSHOT + 2.1-SNAPSHOT @@ -42,7 +42,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT @@ -64,7 +64,7 @@ org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml index 423b9b32c..d1eca2f86 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-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,17 +15,17 @@ org.argeo.commons org.argeo.enterprise - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.3-SNAPSHOT + 2.1-SNAPSHOT @@ -234,7 +234,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3-SNAPSHOT + 2.1-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 7cdd09255..23e185216 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-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT pom @@ -23,12 +23,12 @@ org.argeo.commons org.argeo.cms.e4 - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.e4.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.ext/pom.xml b/dep/org.argeo.dep.cms.ext/pom.xml index af26bb8c7..904349332 100644 --- a/dep/org.argeo.dep.cms.ext/pom.xml +++ b/dep/org.argeo.dep.cms.ext/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT dep .. diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index f88a1ded9..8dc2dd55a 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-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3-SNAPSHOT + 2.1-SNAPSHOT pom @@ -23,17 +23,17 @@ org.argeo.commons org.argeo.api - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.ui.rap/pom.xml b/dep/org.argeo.dep.cms.ui.rap/pom.xml index bf645715d..93ab967ec 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-SNAPSHOT + 2.1-SNAPSHOT dep .. @@ -15,7 +15,7 @@ org.argeo.commons org.argeo.dep.cms.node - 2.3-SNAPSHOT + 2.1-SNAPSHOT pom @@ -49,27 +49,27 @@ org.argeo.commons org.argeo.eclipse.ui - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.ui.theme - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dep/pom.xml b/dep/pom.xml index 028b83b65..b83b2886b 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. dep @@ -118,7 +118,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3-SNAPSHOT + 2.1-SNAPSHOT test diff --git a/dist/argeo-cli/pom.xml b/dist/argeo-cli/pom.xml index 73c11bf92..d04ba5696 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-SNAPSHOT + 2.1-SNAPSHOT dist .. @@ -16,12 +16,12 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dist/argeo-node/pom.xml b/dist/argeo-node/pom.xml index c066a6481..9a6d616b4 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-SNAPSHOT + 2.1-SNAPSHOT dist .. @@ -16,23 +16,23 @@ org.argeo.commons org.argeo.dep.cms.client - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.node - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.dep.cms.e4.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons osgi-boot zip - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dist/containers/pom.xml b/dist/containers/pom.xml index 2c7f6bfcc..cc3242537 100644 --- a/dist/containers/pom.xml +++ b/dist/containers/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT dist .. diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml index 021710088..575b4b4f8 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-SNAPSHOT + 2.1-SNAPSHOT dist .. @@ -23,7 +23,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/dist/pom.xml b/dist/pom.xml index 7e0e20820..f6b9917e0 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. dist diff --git a/org.argeo.api/pom.xml b/org.argeo.api/pom.xml index efd1bed6b..8f3c15c57 100644 --- a/org.argeo.api/pom.xml +++ b/org.argeo.api/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.api diff --git a/org.argeo.cms.e4.rap/pom.xml b/org.argeo.cms.e4.rap/pom.xml index 7f5269876..81f2fcacc 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-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.e4.rap @@ -14,18 +14,18 @@ org.argeo.commons org.argeo.cms.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.cms.e4 - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT provided diff --git a/org.argeo.cms.e4/pom.xml b/org.argeo.cms.e4/pom.xml index ae12564c5..fd1842afd 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-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.e4 @@ -14,14 +14,14 @@ org.argeo.commons org.argeo.cms.ui - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT provided diff --git a/org.argeo.cms.ui.rap/pom.xml b/org.argeo.cms.ui.rap/pom.xml index b38871cc2..37fdd9a17 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-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.ui.rap @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms.ui - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.cms.ui.theme/pom.xml b/org.argeo.cms.ui.theme/pom.xml index be47b820a..b30460a81 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-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.ui.theme diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml index 60eb6203f..186bb1e5b 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-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms.ui @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.3-SNAPSHOT + 2.1-SNAPSHOT provided @@ -28,7 +28,7 @@ org.argeo.commons org.argeo.cms.ui.theme - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index e19f92e01..45aaa917e 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.cms @@ -14,27 +14,27 @@ org.argeo.commons org.argeo.api - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.maintenance - 2.3-SNAPSHOT + 2.1-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.core/pom.xml b/org.argeo.core/pom.xml index 37d89574d..b1dfe92c6 100644 --- a/org.argeo.core/pom.xml +++ b/org.argeo.core/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.core @@ -13,12 +13,12 @@ org.argeo.commons org.argeo.enterprise - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.3-SNAPSHOT + 2.1-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 8b728c16c..e56d4395b 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-SNAPSHOT + 2.1-SNAPSHOT argeo-commons .. @@ -13,7 +13,7 @@ org.argeo.commons org.argeo.eclipse.ui - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml index 1574da881..e3069dd37 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-SNAPSHOT + 2.1-SNAPSHOT argeo-commons .. @@ -18,7 +18,7 @@ org.argeo.commons org.argeo.jcr - 2.3-SNAPSHOT + 2.1-SNAPSHOT diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml index 7a3677206..fef408449 100644 --- a/org.argeo.enterprise/pom.xml +++ b/org.argeo.enterprise/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.enterprise diff --git a/org.argeo.jcr/pom.xml b/org.argeo.jcr/pom.xml index d8d74920f..99becb52e 100644 --- a/org.argeo.jcr/pom.xml +++ b/org.argeo.jcr/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.jcr diff --git a/org.argeo.maintenance/pom.xml b/org.argeo.maintenance/pom.xml index b33e47dfc..b061f87cd 100644 --- a/org.argeo.maintenance/pom.xml +++ b/org.argeo.maintenance/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. org.argeo.maintenance @@ -14,22 +14,22 @@ org.argeo.commons org.argeo.jcr - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.core - 2.3-SNAPSHOT + 2.1-SNAPSHOT org.argeo.commons org.argeo.api - 2.3-SNAPSHOT + 2.1-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml index 33a858d3a..1bf95002e 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-SNAPSHOT + 2.1-SNAPSHOT argeo-commons .. diff --git a/pom.xml b/pom.xml index 143a3ea5a..fb1bedf58 100644 --- a/pom.xml +++ b/pom.xml @@ -8,12 +8,12 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT Argeo Commons pom http://www.argeo.org/ - unstable + testing 2.1.27 @@ -119,12 +119,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/ @@ -140,18 +140,6 @@ false - - argeo-unstable - http://forge.argeo.org/data/java/argeo-2.3/ - - true - never - warn - - - false - - central diff --git a/sdk/pom.xml b/sdk/pom.xml index 54bcb222b..9631f6acd 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.3-SNAPSHOT + 2.1-SNAPSHOT .. sdk