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

---
 cnf/argeo.bnd                          |  1 +
 eclipse/org.argeo.cms.e4/bnd.bnd       |  1 +
 eclipse/org.argeo.cms.servlet/bnd.bnd  |  1 +
 eclipse/org.argeo.cms.swt/bnd.bnd      |  7 ++++---
 jcr/org.argeo.cms.jcr/bnd.bnd          |  1 +
 jcr/org.argeo.cms.ui/bnd.bnd           |  1 +
 rap/org.argeo.cms.ui.rap/bnd.bnd       | 13 +++++++------
 rap/org.argeo.swt.specific.rap/bnd.bnd |  2 +-
 8 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index 7d269d17c..db505a1e5 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/eclipse/org.argeo.cms.e4/bnd.bnd b/eclipse/org.argeo.cms.e4/bnd.bnd
index 3e243f41f..ea9504384 100644
--- a/eclipse/org.argeo.cms.e4/bnd.bnd
+++ b/eclipse/org.argeo.cms.e4/bnd.bnd
@@ -13,4 +13,5 @@ org.eclipse.core.commands.common,\
 org.eclipse.jface.window,\
 org.argeo.cms.swt.auth,\
 org.apache.jackrabbit.*;version="[2,3)",\
+javax.servlet.*;version="[3,5)",\
 *
diff --git a/eclipse/org.argeo.cms.servlet/bnd.bnd b/eclipse/org.argeo.cms.servlet/bnd.bnd
index b539a49bb..7c537ba6b 100644
--- a/eclipse/org.argeo.cms.servlet/bnd.bnd
+++ b/eclipse/org.argeo.cms.servlet/bnd.bnd
@@ -3,6 +3,7 @@ org.osgi.service.http;version=0.0.0,\
 org.osgi.service.http.whiteboard;version=0.0.0,\
 org.osgi.framework.namespace;version=0.0.0,\
 org.argeo.cms.osgi,\
+javax.servlet.*;version="[3,5)",\
 *
 
 Service-Component:\
diff --git a/eclipse/org.argeo.cms.swt/bnd.bnd b/eclipse/org.argeo.cms.swt/bnd.bnd
index 9d4eae6c3..29f820a4c 100644
--- a/eclipse/org.argeo.cms.swt/bnd.bnd
+++ b/eclipse/org.argeo.cms.swt/bnd.bnd
@@ -1,7 +1,8 @@
 Import-Package: org.eclipse.swt,\
-				org.eclipse.jface.window,\
-				org.eclipse.core.commands.common,\
-				*
+org.eclipse.jface.window,\
+org.eclipse.core.commands.common,\
+javax.servlet.*;version="[3,5)",\
+*
 
 Bundle-ActivationPolicy: lazy
 				
\ No newline at end of file
diff --git a/jcr/org.argeo.cms.jcr/bnd.bnd b/jcr/org.argeo.cms.jcr/bnd.bnd
index 3911ec9fe..065f0d15d 100644
--- a/jcr/org.argeo.cms.jcr/bnd.bnd
+++ b/jcr/org.argeo.cms.jcr/bnd.bnd
@@ -26,6 +26,7 @@ org.apache.jackrabbit.webdav.server;version="[1,4)",\
 org.apache.jackrabbit.webdav.simple;version="[1,4)",\
 org.apache.jackrabbit.*;version="[1,4)",\
 junit.*;resolution:=optional,\
+javax.servlet.*;version="[3,5)",\
 *
 
 Service-Component:\
diff --git a/jcr/org.argeo.cms.ui/bnd.bnd b/jcr/org.argeo.cms.ui/bnd.bnd
index ed842413b..c3c609c70 100644
--- a/jcr/org.argeo.cms.ui/bnd.bnd
+++ b/jcr/org.argeo.cms.ui/bnd.bnd
@@ -13,6 +13,7 @@ org.eclipse.rap.rwt.client.service;version="[2.1,4)",\
 org.eclipse.rap.rwt.service;version="[2.1,4)",\
 org.eclipse.rap.rwt.widgets;version="[2.1,4)",\
 org.osgi.*;version=0.0.0,\
+javax.servlet.*;version="[3,5)",\
 *
 
 ## TODO: in order to enable single sourcing, we have introduced dummy RAP packages 
diff --git a/rap/org.argeo.cms.ui.rap/bnd.bnd b/rap/org.argeo.cms.ui.rap/bnd.bnd
index 5b0b8b9f6..e3e71b309 100644
--- a/rap/org.argeo.cms.ui.rap/bnd.bnd
+++ b/rap/org.argeo.cms.ui.rap/bnd.bnd
@@ -4,11 +4,12 @@ org.argeo.eclipse.ui,\
 javax.jcr.nodetype,\
 javax.jcr.security,\
 org.eclipse.swt.graphics,\
-org.eclipse.jetty.util.component;resolution:=optional,\
-org.eclipse.jetty.http;resolution:=optional,\
-org.eclipse.jetty.io;resolution:=optional,\
-org.eclipse.jetty.security;resolution:=optional,\
-org.eclipse.jetty.server.handler;resolution:=optional,\
-org.eclipse.jetty.*;resolution:=optional,\
+org.eclipse.jetty.util.component;version="[9.4,12)";resolution:=optional,\
+org.eclipse.jetty.http;version="[9.4,12)";resolution:=optional,\
+org.eclipse.jetty.io;version="[9.4,12)";resolution:=optional,\
+org.eclipse.jetty.security;version="[9.4,12)";resolution:=optional,\
+org.eclipse.jetty.server.handler;version="[9.4,12)";resolution:=optional,\
+org.eclipse.jetty.*;version="[9.4,12)";resolution:=optional,\
+javax.servlet.*;version="[3,5)",\
 *
 
diff --git a/rap/org.argeo.swt.specific.rap/bnd.bnd b/rap/org.argeo.swt.specific.rap/bnd.bnd
index 76bb82c80..bcd9b195f 100644
--- a/rap/org.argeo.swt.specific.rap/bnd.bnd
+++ b/rap/org.argeo.swt.specific.rap/bnd.bnd
@@ -1,5 +1,5 @@
 Import-Package: org.eclipse.swt,\
 org.eclipse.jface.dialogs,\
-javax.servlet.http,\
 org.eclipse.swt.events,\
+javax.servlet.http;version="[3,5)",\
 *
-- 
2.30.2