From 0e148bc1b59e7cd54602b01e96cbcc3bc1699a4a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Mar 2023 17:29:55 +0100
Subject: [PATCH] Adapt to changes in Argeo TP

---
 Makefile                             | 4 +---
 org.argeo.slc.jcr/bnd.bnd            | 5 ++---
 org.argeo.slc.jcr/build.properties   | 1 -
 sdk/argeo-build                      | 2 +-
 swt/org.argeo.tool.devops.e4/bnd.bnd | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index bbad25a61..786928a83 100644
--- 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 7632cef47..725fe5548 100644
--- 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 4d859a4a9..ffcf29025 100644
--- 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 c8f6d0e6a..fd3449421 160000
--- 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 36231d35b..ad554cca1 100644
--- 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,\
-- 
2.30.2