BUG-7767: Enlarge jetty.servlets import range

This import is used by web.xml only, hence it can serve both
8.1 and 9.2 versions of jetty.

Change-Id: Ic28b6114c4dd5cb356376238002d84086afe7c8f
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/aaa-idmlight/pom.xml b/aaa-idmlight/pom.xml
index 0ee8cc33d50f864aca2c26255f31b5b8bcd52483..fcd3ec881d162e53cdc5fcffa11acc2ca6718d8e 100644 (file)
--- a/aaa-idmlight/pom.xml
+++ b/aaa-idmlight/pom.xml
@@ -160,7 +160,26 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>org.opendaylight.aaa.shiro.realm,org.apache.shiro.web.env,org.apache.shiro.authc,org.opendaylight.aaa.shiro.web.env,org.opendaylight.aaa.shiro.filters,org.opendaylight.aaa.filterchain.filters,javax.servlet.http,javax.ws.rs,javax.ws.rs.core,javax.xml.bind.annotation,org.apache.felix.dm,org.opendaylight.aaa,org.opendaylight.aaa.api.*,org.osgi.framework,org.slf4j,org.eclipse.jetty.servlets,com.sun.jersey.spi.container.servlet,com.google.*,org.opendaylight.*,org.osgi.util.tracker</Import-Package>
+                        <Import-Package>
+                            com.google.*,
+                            com.sun.jersey.spi.container.servlet,
+                            javax.servlet.http,
+                            javax.ws.rs,javax.ws.rs.core,
+                            javax.xml.bind.annotation,
+                            org.apache.felix.dm,
+                            org.apache.shiro.web.env,org.apache.shiro.authc,
+                            org.eclipse.jetty.servlets;version="[8.1,10)",
+                            org.opendaylight.aaa,
+                            org.opendaylight.aaa.api.*,
+                            org.opendaylight.aaa.filterchain.filters,
+                            org.opendaylight.aaa.shiro.filters,
+                            org.opendaylight.aaa.shiro.realm,
+                            org.opendaylight.aaa.shiro.web.env,
+                            org.opendaylight.*,
+                            org.osgi.framework,
+                            org.osgi.util.tracker,
+                            org.slf4j,
+                        </Import-Package>
                         <Web-ContextPath>/auth</Web-ContextPath>
                         <!--<Web-Connectors>adminConn</Web-Connectors> -->
                         <!--Bundle-Activator>org.opendaylight.aaa.idm.Activator</Bundle-Activator-->