BUG-7767: Enlarge jetty.servlets import range

Referring to Change 51992, it can fix the bundle
dependency issue about importing jetty.

Change-Id: Ia4527b301cc13ce4c9f52f03a445395172bc2074
Signed-off-by: jensenzhang <jingxuan.n.zhang@gmail.com>

diff --git a/alto-core/northbound/impl/pom.xml b/alto-core/northbound/impl/pom.xml
index 463bc715b8cc47d3d67898e64df55b098bf5bafc..be558d8ac70981ae553613eaaa2ac89340e65732 100644 (file)
--- a/alto-core/northbound/impl/pom.xml
+++ b/alto-core/northbound/impl/pom.xml
@@ -100,7 +100,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <Import-Package>
               *,
               com.sun.jersey.spi.container.servlet,
-              org.eclipse.jetty.servlets,
+              org.eclipse.jetty.servlets;version="[8.1,10)",
               org.opendaylight.aaa.shiro.filters,
               org.opendaylight.aaa.shiro.realm,
               org.opendaylight.aaa.shiro.web.env,

diff --git a/alto-core/standard-northbound-routes/costmap/impl/pom.xml b/alto-core/standard-northbound-routes/costmap/impl/pom.xml
index 6a8fb8b2b04d29a8fa6e4245af24d684a5ca61b7..a5dc62f45aa9c14cb1853a8186753ba9b1aa75eb 100644 (file)
--- a/alto-core/standard-northbound-routes/costmap/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/costmap/impl/pom.xml
@@ -114,7 +114,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>*,com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets</Import-Package>
+            <Import-Package>
+              *,
+              com.sun.jersey.spi.container.servlet,
+              org.eclipse.jetty.servlets;version="[8.1,10)"
+            </Import-Package>
             <Web-ContextPath>/alto</Web-ContextPath>
           </instructions>
         </configuration>

diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml b/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml
index 46534f37d941110f4bda16ec4604520ca8723935..d5a473d8d52ccc66cd85ef30631df2b64801fc1c 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml
@@ -115,7 +115,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>*,com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets</Import-Package>
+            <Import-Package>
+              *,
+              com.sun.jersey.spi.container.servlet,
+              org.eclipse.jetty.servlets;version="[8.1,10)"
+            </Import-Package>
             <Web-ContextPath>/alto</Web-ContextPath>
           </instructions>
         </configuration>

diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml b/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml
index e482a73203f6bbde8fe2a9c5200fbdff1505c78e..69dc4c80039fd81817cbe2ac34d7f40c035d8ddc 100644 (file)
--- a/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml
@@ -9,124 +9,128 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.opendaylight.alto.core</groupId>
-    <artifactId>alto-northbound-route-endpointproperty-impl</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <packaging>bundle</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.opendaylight.alto.core</groupId>
+  <artifactId>alto-northbound-route-endpointproperty-impl</artifactId>
+  <version>0.4.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>config-api</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>alto-northbound-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>alto-northbound-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>alto-northbound-impl</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>alto-northbound-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>alto-service-model-endpointproperty-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>alto-service-model-endpointproperty-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>alto-northbound-route-endpointproperty-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>alto-northbound-route-endpointproperty-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types-2013-07-15</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
 
-        <!-- Testing Dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
+    <!-- Testing Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-json-org</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-json-org</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlets</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>*,com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets</Import-Package>
-                        <Web-ContextPath>/alto</Web-ContextPath>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${bundle.plugin.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              *,
+              com.sun.jersey.spi.container.servlet,
+              org.eclipse.jetty.servlets;version="[8.1,10)"
+            </Import-Package>
+            <Web-ContextPath>/alto</Web-ContextPath>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>

diff --git a/alto-core/standard-northbound-routes/example/pom.xml b/alto-core/standard-northbound-routes/example/pom.xml
index d5a17efd932c044af1a745afdcf015b132a6e418..246898f21cfcbb3505fe77d9b67bd2ba4bc9f1a5 100644 (file)
--- a/alto-core/standard-northbound-routes/example/pom.xml
+++ b/alto-core/standard-northbound-routes/example/pom.xml
@@ -97,7 +97,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>*,com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets</Import-Package>
+            <Import-Package>
+              *,
+              com.sun.jersey.spi.container.servlet,
+              org.eclipse.jetty.servlets;version="[8.1,10)"
+            </Import-Package>
             <Web-ContextPath>/alto</Web-ContextPath>
           </instructions>
         </configuration>

diff --git a/alto-core/standard-northbound-routes/networkmap/impl/pom.xml b/alto-core/standard-northbound-routes/networkmap/impl/pom.xml
index d1e6ccb9f207b6ea6c9af18a330392d450d7d208..dd68728d5b555a8bb8bef6c0f043012554844481 100644 (file)
--- a/alto-core/standard-northbound-routes/networkmap/impl/pom.xml
+++ b/alto-core/standard-northbound-routes/networkmap/impl/pom.xml
@@ -114,7 +114,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Import-Package>*,com.sun.jersey.spi.container.servlet, org.eclipse.jetty.servlets</Import-Package>
+            <Import-Package>
+              *,
+              com.sun.jersey.spi.container.servlet,
+              org.eclipse.jetty.servlets;version="[8.1,10)"
+            </Import-Package>
             <Web-ContextPath>/alto</Web-ContextPath>
           </instructions>
         </configuration>