OSGi manifests generation fixes cleanup

jetty-osgi/jetty-osgi-boot-jsp/pom.xml

@@ -84,7 +84,6 @@
           </executions>
           <configuration>
               <instructions>
-                <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot.jsp</Bundle-SymbolicName>
                 <Bundle-Name>Jetty-OSGi-Jasper Integration</Bundle-Name>
                 <Bundle-Classpath />
                 <Fragment-Host>org.eclipse.jetty.osgi.boot</Fragment-Host>

jetty-osgi/jetty-osgi-boot-warurl/pom.xml

@@ -63,10 +63,8 @@
           </executions>
           <configuration>
               <instructions>
-                  <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot.warurl;singleton:=true</Bundle-SymbolicName>
                   <Bundle-Name>RFC66 War URL</Bundle-Name>
                   <Bundle-Activator>org.eclipse.jetty.osgi.boot.warurl.WarUrlActivator</Bundle-Activator>
-                  <_nouses>true</_nouses>
               </instructions>
           </configuration>
       </plugin>

jetty-osgi/jetty-osgi-boot/pom.xml

@@ -104,15 +104,8 @@
                 </executions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot;singleton:=true</Bundle-SymbolicName>
-                        <Bundle-Name>Jetty OSGi Boot</Bundle-Name>
                         <Bundle-Activator>org.eclipse.jetty.osgi.boot.JettyBootstrapActivator</Bundle-Activator>
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
                         <Export-Package>org.eclipse.jetty.osgi.boot;version="${parsedVersion.osgiVersion}",org.eclipse.jetty.osgi.boot.utils,org.eclipse.jetty.osgi.nested;version="${parsedVersion.osgiVersion}"</Export-Package>
-                        <!-- disable the uses directive: jetty will accomodate pretty much any versions
-                        of the packages it uses; no need to reflect some tight dependency determined at
-                        compilation time. -->
-                        <_nouses>true</_nouses>
                         <Import-Package>javax.mail;version="1.4.0";resolution:=optional,
  javax.mail.event;version="1.4.0";resolution:=optional,
  javax.mail.internet;version="1.4.0";resolution:=optional,
@@ -137,8 +130,6 @@
  *
                         </Import-Package>
                         <DynamicImport-Package>org.eclipse.jetty.*;version="9.0.0"</DynamicImport-Package>
-                        <!--Require-Bundle/-->
-                        <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
                     </instructions>
                 </configuration>
             </plugin>

jetty-spdy/spdy-core/pom.xml

@@ -11,7 +11,7 @@
     <name>Jetty :: SPDY :: Core</name>
 
     <properties>
-        <bundle-symbolic-name>${project.groupId}.spdy.core</bundle-symbolic-name>
+        <bundle-symbolic-name>${project.groupId}.core</bundle-symbolic-name>
     </properties>
 
     <build>

jetty-spdy/spdy-http-server/pom.xml

@@ -45,33 +45,20 @@
                     <argLine>-Xbootclasspath/p:${project.build.directory}/npn/npn-boot-${npn.version}.jar</argLine>
                 </configuration>
             </plugin>
-<!--             <plugin>
+             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
                 <executions>
                     <execution>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
                         <configuration>
                             <instructions>
-                                 <Import-Package>javax.net.*,*</Import-Package>
+                                 <Import-Package>org.eclipse.jetty.npn;version="0";resolution:=optional,*</Import-Package>
                                  <Export-Package>*</Export-Package>
                             </instructions>
                           </configuration>
                        </execution>
                   </executions>
             </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jar-plugin</artifactId>
-              <configuration>
-                  <archive>
-                      <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                  </archive>
-              </configuration>
-            </plugin>-->
        </plugins>
     </build>
 

pom.xml

@@ -261,7 +261,8 @@
           <extensions>true</extensions>
           <configuration>
             <instructions>
-              <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+              <Bundle-SymbolicName>${bundle-symbolic-name}</Bundle-SymbolicName>
+              <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
               <Bundle-DocURL>${jetty.url}</Bundle-DocURL>
               <Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
               <Bundle-Classpath>.</Bundle-Classpath>

test-jetty-webapp/pom.xml

@@ -88,7 +88,6 @@
                 https://issues.apache.org/jira/browse/FELIX-1571
                 -->
                 <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
-                <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
               </instructions>
             </configuration>
            </execution>

test-jetty-webapp/src/main/webapp/META-INF/MANIFEST.MF

@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.jetty.client,
  org.eclipse.jetty.util,
  org.eclipse.jetty.websocket
 Bundle-ClassPath: WEB-INF/classes
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Web-ContextPath: /
 Class-Path: