Adapt to changes in Argeo TP

diff --git a/Makefile b/Makefile
index bbad25a6192878e3bc6b95275362b76625a63aef..786928a83ca92da551c2192b81c2524bb208532b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,10 @@ swt/rap/org.argeo.tool.rap.cli \
 swt/rap/org.argeo.tool.server \
 
 DEP_CATEGORIES = \
+crypto/fips/org.argeo.tp.crypto \
 org.argeo.tp \
 org.argeo.tp.sdk \
-org.argeo.tp.build \
-org.argeo.tp.crypto \
 org.argeo.tp.jetty \
-org.argeo.tp.sql \
 org.argeo.tp.utils \
 org.argeo.tp.jcr \
 org.argeo.tp.gis \

diff --git a/org.argeo.slc.jcr/bnd.bnd b/org.argeo.slc.jcr/bnd.bnd
index 7632cef47ba6409bf83423354e0164c70da86159..725fe55485c46aa9b16cd48895fae64805eb6ecf 100644 (file)
--- a/org.argeo.slc.jcr/bnd.bnd
+++ b/org.argeo.slc.jcr/bnd.bnd
@@ -1,6 +1,5 @@
 Import-Package: javax.jcr.nodetype,\
 javax.jcr.security,\
-org.apache.jackrabbit.api;version="[1,4)",\
-org.apache.jackrabbit.commons;version="[1,4)",\
-org.apache.jackrabbit.*;version="[1,4)",\
+org.apache.jackrabbit.api,\
+org.apache.jackrabbit.commons,\
 *
\ No newline at end of file

diff --git a/org.argeo.slc.jcr/build.properties b/org.argeo.slc.jcr/build.properties
index 4d859a4a9b807a1d65290e1f4f8e983eb716c160..ffcf290255a6ff5b645e5c00d0c6fb32443038dd 100644 (file)
--- a/org.argeo.slc.jcr/build.properties
+++ b/org.argeo.slc.jcr/build.properties
@@ -6,7 +6,6 @@ additional.bundles = org.junit,\
                      org.apache.jackrabbit.core,\
                      javax.jcr,\
                      org.apache.jackrabbit.api,\
-                     org.apache.jackrabbit.data,\
                      org.apache.jackrabbit.jcr.commons,\
                      org.apache.jackrabbit.spi,\
                      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

diff --git a/swt/org.argeo.tool.devops.e4/bnd.bnd b/swt/org.argeo.tool.devops.e4/bnd.bnd
index 36231d35b27129c98534b4d3230b2ba0b5d6ae85..ad554cca177ab7dae2395ac73333b52b9b34c4b2 100644 (file)
--- a/swt/org.argeo.tool.devops.e4/bnd.bnd
+++ b/swt/org.argeo.tool.devops.e4/bnd.bnd
@@ -8,7 +8,6 @@ org.eclipse.core.commands.common,\
 org.eclipse.e4.ui.model.application.ui;resolution:=optional,\
 org.eclipse.e4.ui.model.application;resolution:=optional,\
 javax.jcr.nodetype,\
-org.apache.jackrabbit.*;version="[2,3)",\
 org.argeo.cms,\
 org.argeo.jcr,\
 org.argeo.api.acr,\