Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugues Malphettes2012-09-25 03:24:16 +0000
committerHugues Malphettes2012-09-25 03:24:16 +0000
commit29c18fc4d555957b5bfbc035f1f2a8f71187f5df (patch)
tree84b71ec59440ddfb1ff5b9203425541627364afe /jetty-spdy
parentb593c473168d87d1abae3ee9543ee1796483e1af (diff)
downloadorg.eclipse.jetty.project-29c18fc4d555957b5bfbc035f1f2a8f71187f5df.tar.gz
org.eclipse.jetty.project-29c18fc4d555957b5bfbc035f1f2a8f71187f5df.tar.xz
org.eclipse.jetty.project-29c18fc4d555957b5bfbc035f1f2a8f71187f5df.zip
OSGi manifests generation fixes cleanup
Diffstat (limited to 'jetty-spdy')
-rw-r--r--jetty-spdy/spdy-core/pom.xml2
-rw-r--r--jetty-spdy/spdy-http-server/pom.xml17
2 files changed, 3 insertions, 16 deletions
diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml
index 11f0ef1fb3..e45d896d99 100644
--- a/jetty-spdy/spdy-core/pom.xml
+++ b/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>
diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml
index ec61bbbdbf..e6c292793e 100644
--- a/jetty-spdy/spdy-http-server/pom.xml
+++ b/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>

Back to the top