From 1b19768708b71b3c31f0344100ba980ad7dc6f9d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 11 Feb 2022 11:06:29 +0100
Subject: [PATCH] Adapt to changes in third-party distribution.

---
 cnf/argeo.bnd                         | 1 +
 org.argeo.app.servlet.odk/bnd.bnd     | 1 +
 org.argeo.app.servlet.publish/bnd.bnd | 1 +
 org.argeo.app.theme.default/bnd.bnd   | 1 +
 org.argeo.app.ui/bnd.bnd              | 1 +
 5 files changed, 5 insertions(+)

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index 7d269d1..db505a1 100644
--- a/cnf/argeo.bnd
+++ b/cnf/argeo.bnd
@@ -3,6 +3,7 @@ Bundle-Version: ${version.released}${qualifier}
 Private-Package: *.internal.*
 Export-Package: !*.internal.*, *
 #-consumer-policy : ${range;[==,=+)}
+-contract: !JavaServlet,*
 -savemanifest : META-INF/MANIFEST.MF
 -includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
 -compression STORE
diff --git a/org.argeo.app.servlet.odk/bnd.bnd b/org.argeo.app.servlet.odk/bnd.bnd
index 2be1b60..f5cd217 100644
--- a/org.argeo.app.servlet.odk/bnd.bnd
+++ b/org.argeo.app.servlet.odk/bnd.bnd
@@ -13,4 +13,5 @@ OSGI-INF/odkManifestServlet.xml
 Import-Package:\
 org.osgi.service.http.context,\
 javax.jcr.nodetype,\
+javax.servlet.*;version="[3,5)",\
 *
diff --git a/org.argeo.app.servlet.publish/bnd.bnd b/org.argeo.app.servlet.publish/bnd.bnd
index e0916f3..60f0d37 100644
--- a/org.argeo.app.servlet.publish/bnd.bnd
+++ b/org.argeo.app.servlet.publish/bnd.bnd
@@ -8,6 +8,7 @@ org.osgi.framework,\
 org.apache.xml.serializer,\
 org.eclipse.rap.rwt,\
 org.argeo.app.api,\
+javax.servlet.*;version="[3,5)",\
 *
 
 Require-Capability:\
diff --git a/org.argeo.app.theme.default/bnd.bnd b/org.argeo.app.theme.default/bnd.bnd
index 21883fd..45dc19e 100644
--- a/org.argeo.app.theme.default/bnd.bnd
+++ b/org.argeo.app.theme.default/bnd.bnd
@@ -3,4 +3,5 @@ OSGI-INF/cmsTheme.xml
 
 Import-Package:\
 org.argeo.cms.swt.osgi,\
+javax.servlet.*;version="[3,5)",\
 *
\ No newline at end of file
diff --git a/org.argeo.app.ui/bnd.bnd b/org.argeo.app.ui/bnd.bnd
index dd7c25e..e36f705 100644
--- a/org.argeo.app.ui/bnd.bnd
+++ b/org.argeo.app.ui/bnd.bnd
@@ -33,4 +33,5 @@ org.eclipse.core.commands.common,\
 org.eclipse.jface.window,\
 org.eclipse.jface.dialogs,\
 org.eclipse.rap.rwt,\
+javax.servlet.*;version="[3,5)",\
 *
-- 
2.30.2