From: Mathieu Baudier Date: Fri, 7 Apr 2017 15:50:19 +0000 (+0200) Subject: Merge branch 'master' of https://mbaudier@code.argeo.org/git/apache2/argeo-commons.git X-Git-Tag: argeo-commons-2.1.68~14 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=7864616a19aefc440239c1c8854c6b3969be7af0;hp=3710b850fc3d3e6002b60cec37ce6d4f1b334863;p=lgpl%2Fargeo-commons.git Merge branch 'master' of https://mbaudier@code.argeo.org/git/apache2/argeo-commons.git --- diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml index 4d5d94dee..93706e1d6 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.1.66-SNAPSHOT + 2.1.68-SNAPSHOT dep .. @@ -15,12 +15,12 @@ org.argeo.commons org.argeo.util - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT @@ -203,7 +203,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT test diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml index f73bb01f6..d1bd9eb9c 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.1.66-SNAPSHOT + 2.1.68-SNAPSHOT dep .. @@ -15,45 +15,45 @@ org.argeo.commons org.argeo.dep.cms.client - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT pom org.argeo.commons org.argeo.node.api - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.cms - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.cms.ui - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.ext.jackrabbit - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml index ba303511c..8acdebe71 100644 --- a/dep/org.argeo.dep.cms.platform/pom.xml +++ b/dep/org.argeo.dep.cms.platform/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT dep .. @@ -15,28 +15,23 @@ org.argeo.commons org.argeo.dep.cms.node - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT pom org.argeo.commons org.argeo.cms.ui.workbench - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons - org.argeo.ext.rap.ui.workbench - 2.1.66-SNAPSHOT - - - org.argeo.commons - org.argeo.cms.ui.workbench - 2.1.66-SNAPSHOT + org.argeo.cms.ui.workbench.rap + 2.1.68-SNAPSHOT org.argeo.commons - org.argeo.cms.ui.workbench.rap - 2.1.66-SNAPSHOT + org.argeo.ext.rap.ui.workbench + 2.1.68-SNAPSHOT diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml index d9f2c99a7..bf5232615 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.1.66-SNAPSHOT + 2.1.68-SNAPSHOT dep .. @@ -13,7 +13,7 @@ org.argeo.commons org.argeo.dep.cms.platform - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT pom diff --git a/dep/pom.xml b/dep/pom.xml index 3539261f4..3dd7568d5 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. dep @@ -76,7 +76,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT test diff --git a/dist/osgi-boot/pom.xml b/dist/osgi-boot/pom.xml index 5aeea78ad..9a4ceff7d 100644 --- a/dist/osgi-boot/pom.xml +++ b/dist/osgi-boot/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT dist .. @@ -23,7 +23,7 @@ org.argeo.commons org.argeo.osgi.boot - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT diff --git a/dist/pom.xml b/dist/pom.xml index 9e0118287..1633c34a8 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. dist diff --git a/org.argeo.cms.ui.workbench.rap/pom.xml b/org.argeo.cms.ui.workbench.rap/pom.xml index 358922c5a..9b5e1cfbf 100644 --- a/org.argeo.cms.ui.workbench.rap/pom.xml +++ b/org.argeo.cms.ui.workbench.rap/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT argeo-commons .. @@ -14,13 +14,13 @@ org.argeo.commons org.argeo.cms.ui.workbench - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.cms.ui.workbench/pom.xml b/org.argeo.cms.ui.workbench/pom.xml index bd65129ca..03156d170 100644 --- a/org.argeo.cms.ui.workbench/pom.xml +++ b/org.argeo.cms.ui.workbench/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.argeo.commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT argeo-commons .. @@ -14,27 +14,12 @@ org.argeo.commons org.argeo.cms.ui - 2.1.66-SNAPSHOT - - - org.argeo.commons - org.argeo.util - 2.1.66-SNAPSHOT - - - org.argeo.commons - org.argeo.enterprise - 2.1.66-SNAPSHOT - - - org.argeo.commons - org.argeo.eclipse.ui - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT provided diff --git a/org.argeo.cms.ui/pom.xml b/org.argeo.cms.ui/pom.xml index 3c5ee7695..cfb16f11e 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.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. org.argeo.cms.ui @@ -14,12 +14,12 @@ org.argeo.commons org.argeo.cms - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT provided diff --git a/org.argeo.cms/pom.xml b/org.argeo.cms/pom.xml index 3c3af722e..754c35e21 100644 --- a/org.argeo.cms/pom.xml +++ b/org.argeo.cms/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. org.argeo.cms @@ -14,27 +14,27 @@ org.argeo.commons org.argeo.node.api - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.enterprise - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.eclipse.ui.rap - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT provided diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml index f010b8eda..7fc76933b 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.1.66-SNAPSHOT + 2.1.68-SNAPSHOT argeo-commons .. @@ -13,12 +13,12 @@ org.argeo.commons org.argeo.eclipse.ui - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.util - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml index 1346c0a91..ac58910d7 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.1.66-SNAPSHOT + 2.1.68-SNAPSHOT argeo-commons .. @@ -13,12 +13,12 @@ org.argeo.commons org.argeo.util - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.enterprise/pom.xml b/org.argeo.enterprise/pom.xml index 1210ae0dc..e5ca63f84 100644 --- a/org.argeo.enterprise/pom.xml +++ b/org.argeo.enterprise/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. org.argeo.enterprise diff --git a/org.argeo.ext.jackrabbit/pom.xml b/org.argeo.ext.jackrabbit/pom.xml index 512d432bd..836844533 100644 --- a/org.argeo.ext.jackrabbit/pom.xml +++ b/org.argeo.ext.jackrabbit/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. org.argeo.ext.jackrabbit @@ -13,14 +13,14 @@ org.argeo.commons org.argeo.node.api - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT org.argeo.commons org.argeo.jcr - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT test diff --git a/org.argeo.ext.rap.ui.workbench/pom.xml b/org.argeo.ext.rap.ui.workbench/pom.xml index 612b0ed5d..f076e49e4 100644 --- a/org.argeo.ext.rap.ui.workbench/pom.xml +++ b/org.argeo.ext.rap.ui.workbench/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.argeo.commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT argeo-commons .. diff --git a/org.argeo.jcr/pom.xml b/org.argeo.jcr/pom.xml index d8f873bcd..48ea95620 100644 --- a/org.argeo.jcr/pom.xml +++ b/org.argeo.jcr/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. org.argeo.jcr @@ -12,7 +12,7 @@ org.argeo.commons org.argeo.util - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT \ No newline at end of file diff --git a/org.argeo.node.api/pom.xml b/org.argeo.node.api/pom.xml index ecca9d251..0ba5048aa 100644 --- a/org.argeo.node.api/pom.xml +++ b/org.argeo.node.api/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. org.argeo.node.api diff --git a/org.argeo.osgi.boot/pom.xml b/org.argeo.osgi.boot/pom.xml index c1e5ba506..4792d6ec3 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.1.66-SNAPSHOT + 2.1.68-SNAPSHOT argeo-commons .. diff --git a/org.argeo.util/pom.xml b/org.argeo.util/pom.xml index fade67fd7..51f3099cf 100644 --- a/org.argeo.util/pom.xml +++ b/org.argeo.util/pom.xml @@ -4,7 +4,7 @@ org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT .. org.argeo.util diff --git a/pom.xml b/pom.xml index 450c1c9cb..7fa2f7669 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 org.argeo.commons argeo-commons - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT Argeo Commons pom - 2.1.66-SNAPSHOT + 2.1.68-SNAPSHOT 2.1 2012-12-19 2.1.17