Bug 348045 - Problem with packages exported from servletbridge

2 files changed, 23 insertions, 37 deletions

diff --git a/features/org.eclipse.equinox.serverside.sdk/feature.xml b/features/org.eclipse.equinox.serverside.sdk/feature.xml
index 4c056501b..32c07165b 100644
--- a/features/org.eclipse.equinox.serverside.sdk/feature.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.equinox.serverside.sdk"
       label="%featureName"
-      version="3.8.0.qualifier"
+      version="3.9.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.0.qualifier">
@@ -31,10 +31,6 @@
          id="org.eclipse.equinox.server.p2"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.equinox.server.servletbridge"
-         version="0.0.0"/>
-
    <plugin
          id="javax.servlet"
          download-size="0"
@@ -146,93 +142,91 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
    <plugin
          id="org.apache.jasper.glassfish"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+
    <plugin
          id="org.apache.jasper.glassfish.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.jetty.continuation"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>   
-    
-     <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.jetty.continuation.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>   
-    
-     <plugin
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.jetty.http"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>   
+         unpack="false"/>
 
-     <plugin
+   <plugin
          id="org.eclipse.jetty.http.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>   
+         unpack="false"/>
 
-    
-     <plugin
+   <plugin
          id="org.eclipse.jetty.io"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-     <plugin
+   <plugin
          id="org.eclipse.jetty.io.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-    
-    <plugin
+   <plugin
          id="org.eclipse.jetty.security"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-    <plugin
+   <plugin
          id="org.eclipse.jetty.security.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-
-    <plugin
+   <plugin
          id="org.eclipse.jetty.server"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-    <plugin
+   <plugin
          id="org.eclipse.jetty.server.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-
    <plugin
          id="org.eclipse.jetty.servlet"
          download-size="0"
@@ -240,7 +234,7 @@
          version="0.0.0"
          unpack="false"/>
 
-  <plugin
+   <plugin
          id="org.eclipse.jetty.servlet.source"
          download-size="0"
          install-size="0"
@@ -289,12 +283,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.servletbridge.extensionbundle"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-</feature>
\ No newline at end of file
+</feature>
diff --git a/features/org.eclipse.equinox.serverside.sdk/pom.xml b/features/org.eclipse.equinox.serverside.sdk/pom.xml
index 5f7cbdcfc..0faeef141 100644
--- a/features/org.eclipse.equinox.serverside.sdk/pom.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.serverside.sdk</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>