Adaptation to the new Argeo Distribution approach

diff --git a/eclipse/org.argeo.cms.e4/bnd.bnd b/eclipse/org.argeo.cms.e4/bnd.bnd
index e4a4519f0537549b77d4901f7efbf2d62340e4e3..3e243f41f03e1b79ea712557c77f58472a4da10c 100644 (file)
--- a/eclipse/org.argeo.cms.e4/bnd.bnd
+++ b/eclipse/org.argeo.cms.e4/bnd.bnd
@@ -12,4 +12,5 @@ org.argeo.cms,\
 org.eclipse.core.commands.common,\
 org.eclipse.jface.window,\
 org.argeo.cms.swt.auth,\
+org.apache.jackrabbit.*;version="[2,3)",\
 *

diff --git a/jcr/org.argeo.cms.jcr/bnd.bnd b/jcr/org.argeo.cms.jcr/bnd.bnd
index 71071f697f26788d57867f480da6ffd6919154cd..6e3f15940647f05b9315542f4222adcf89628d0f 100644 (file)
--- a/jcr/org.argeo.cms.jcr/bnd.bnd
+++ b/jcr/org.argeo.cms.jcr/bnd.bnd
@@ -11,18 +11,20 @@ org.argeo.cms.servlet,\
 javax.jcr.security,\
 org.h2;resolution:=optional,\
 org.postgresql;version="[42,43)";resolution:=optional,\
-org.apache.jackrabbit.webdav.server,\
-org.apache.jackrabbit.webdav.jcr,\
 org.apache.commons.httpclient.cookie;resolution:=optional,\
 org.osgi.framework.namespace;version=0.0.0,\
 org.osgi.*;version=0.0.0,\
 org.osgi.service.http.whiteboard,\
-org.apache.jackrabbit.api,\
-org.apache.jackrabbit.commons,\
-org.apache.jackrabbit.spi,\
-org.apache.jackrabbit.spi2dav,\
-org.apache.jackrabbit.spi2davex,\
-org.apache.jackrabbit.webdav,\
+org.apache.jackrabbit.api.stats;version="[1,3)",\
+org.apache.jackrabbit.api;version="[2,3)",\
+org.apache.jackrabbit.commons;version="[2,3)",\
+org.apache.jackrabbit.spi;version="[2,3)",\
+org.apache.jackrabbit.spi2dav;version="[2,3)",\
+org.apache.jackrabbit.spi2davex;version="[2,3)",\
+org.apache.jackrabbit.webdav.jcr;version="[2,3)",\
+org.apache.jackrabbit.webdav.server;version="[2,3)",\
+org.apache.jackrabbit.webdav.simple;version="[2,3)",\
+org.apache.jackrabbit.*;version="[2,3)",\
 junit.*;resolution:=optional,\
 *