Adapt to changes in Argeo TP

diff --git a/org.argeo.cms.jcr/bnd.bnd b/org.argeo.cms.jcr/bnd.bnd
index 8cda76ffb505b6c4a2dacb40d2ccfcc9b5dbbe66..5b3a42bdaeaa9e9f43594358b26b330c92bd9fd3 100644 (file)
--- a/org.argeo.cms.jcr/bnd.bnd
+++ b/org.argeo.cms.jcr/bnd.bnd
@@ -14,16 +14,15 @@ org.postgresql;version="[42,43)";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.stats;version="[1,4)",\
-org.apache.jackrabbit.api;version="[1,4)",\
-org.apache.jackrabbit.commons;version="[1,4)",\
-org.apache.jackrabbit.spi;version="[1,4)",\
-org.apache.jackrabbit.spi2dav;version="[1,4)",\
-org.apache.jackrabbit.spi2davex;version="[1,4)",\
-org.apache.jackrabbit.webdav.jcr;version="[1,4)",\
-org.apache.jackrabbit.webdav.server;version="[1,4)",\
-org.apache.jackrabbit.webdav.simple;version="[1,4)",\
-org.apache.jackrabbit.*;version="[1,4)",\
+org.apache.jackrabbit.api.stats,\
+org.apache.jackrabbit.api,\
+org.apache.jackrabbit.commons,\
+org.apache.jackrabbit.spi,\
+org.apache.jackrabbit.spi2dav,\
+org.apache.jackrabbit.spi2davex,\
+org.apache.jackrabbit.webdav.jcr,\
+org.apache.jackrabbit.webdav.server,\
+org.apache.jackrabbit.webdav.simple,\
 junit.*;resolution:=optional,\
 javax.servlet.*;version="[3,5)",\
 *

diff --git a/org.argeo.cms.jcr/build.properties b/org.argeo.cms.jcr/build.properties
index 859c241febdf2baf040bbdfb0ae62ca2f932bd11..c0e310bb3d4fb85fb307a7a8baa173ae53772a09 100644 (file)
--- a/org.argeo.cms.jcr/build.properties
+++ b/org.argeo.cms.jcr/build.properties
@@ -4,5 +4,4 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                OSGI-INF/jcrContentProvider.xml
 source.. = src/
-additional.bundles = org.apache.jackrabbit.data,\
-                     org.apache.jackrabbit.spi.commons
+additional.bundles = org.apache.jackrabbit.spi.commons

diff --git a/sdk/argeo-build b/sdk/argeo-build
index c8f6d0e6aa4d9a6f24dd4ba4f9ac7878945d6e89..fd3449421a3d3e61756cc1ed8bd6e698ecd9eb11 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit c8f6d0e6aa4d9a6f24dd4ba4f9ac7878945d6e89
+Subproject commit fd3449421a3d3e61756cc1ed8bd6e698ecd9eb11