Adapt to changes in third-party distribution.

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index 7d269d17cd93a04036525e98615a123425341eb0..db505a1e56fd3d3a973d2a5df70eaa2d4b9f1617 100644 (file)
--- 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 2be1b60cb36beba06a722cb277d4abe963da50a2..f5cd2170acf14a74885ce71b9d8402d1482363a2 100644 (file)
--- 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 e0916f3a4907166962b18e4644052aa800cced0f..60f0d37bb41c09c754a0dd3ba4d8932d60b89f43 100644 (file)
--- 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 21883fda08bea76c13d13ac427be6231a6d8f3a7..45dc19ece6f0a5ef8971041c2d8d9c35ae245c91 100644 (file)
--- 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 dd7c25e1f87574d781882de5eb06e87a01a8cc07..e36f7057184e97dbae4018b35593dfafa94f8934 100644 (file)
--- 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)",\
 *