Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-08-15 09:35:49 +0000
committerGreg Wilkins2014-08-15 09:35:49 +0000
commitb47f9ef60522ad435d516741646e8e9acf2a6302 (patch)
tree0d372a27c44fdda26d4a668b15c32b514853fd7e
parent48b1f9f3f1e472588b1f4118e8fda101bfe3a1c8 (diff)
downloadorg.eclipse.jetty.project-b47f9ef60522ad435d516741646e8e9acf2a6302.tar.gz
org.eclipse.jetty.project-b47f9ef60522ad435d516741646e8e9acf2a6302.tar.xz
org.eclipse.jetty.project-b47f9ef60522ad435d516741646e8e9acf2a6302.zip
cleaned up OSGi manifest creation
-rw-r--r--apache-jstl/pom.xml3
-rw-r--r--examples/async-rest/async-rest-jar/pom.xml3
-rw-r--r--examples/embedded/pom.xml3
-rw-r--r--examples/quickstart/pom.xml3
-rw-r--r--jetty-alpn/jetty-alpn-client/pom.xml9
-rw-r--r--jetty-alpn/jetty-alpn-server/pom.xml27
-rw-r--r--jetty-annotations/pom.xml12
-rw-r--r--jetty-ant/pom.xml3
-rw-r--r--jetty-client/pom.xml10
-rw-r--r--jetty-continuation/pom.xml29
-rw-r--r--jetty-deploy/pom.xml12
-rw-r--r--jetty-http-spi/pom.xml29
-rw-r--r--jetty-http/pom.xml28
-rw-r--r--jetty-http2/http2-client/pom.xml32
-rw-r--r--jetty-http2/http2-common/pom.xml32
-rw-r--r--jetty-http2/http2-hpack/pom.xml31
-rw-r--r--jetty-http2/http2-server/pom.xml30
-rw-r--r--jetty-http2/pom.xml32
-rw-r--r--jetty-io/pom.xml29
-rw-r--r--jetty-jaas/pom.xml9
-rw-r--r--jetty-jaspi/pom.xml32
-rw-r--r--jetty-jmx/pom.xml29
-rw-r--r--jetty-jndi/pom.xml29
-rw-r--r--jetty-jsp/pom.xml3
-rw-r--r--jetty-jspc-maven-plugin/pom.xml1
-rw-r--r--jetty-maven-plugin/pom.xml1
-rw-r--r--jetty-monitor/pom.xml29
-rw-r--r--jetty-nosql/pom.xml34
-rw-r--r--jetty-npn/jetty-npn-client/pom.xml9
-rw-r--r--jetty-npn/jetty-npn-server/pom.xml27
-rw-r--r--jetty-osgi/jetty-osgi-alpn/pom.xml34
-rw-r--r--jetty-osgi/jetty-osgi-npn/pom.xml37
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java9
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java2
-rw-r--r--jetty-overlay-deployer/pom.xml1
-rw-r--r--jetty-plus/pom.xml9
-rw-r--r--jetty-proxy/pom.xml29
-rw-r--r--jetty-quickstart/pom.xml3
-rw-r--r--jetty-rewrite/pom.xml29
-rw-r--r--jetty-runner/pom.xml1
-rw-r--r--jetty-security/pom.xml12
-rw-r--r--jetty-server/pom.xml11
-rw-r--r--jetty-servlet/pom.xml8
-rw-r--r--jetty-servlets/pom.xml29
-rw-r--r--jetty-spdy/pom.xml10
-rw-r--r--jetty-spdy/spdy-alpn-tests/pom.xml4
-rw-r--r--jetty-spdy/spdy-client/pom.xml8
-rw-r--r--jetty-spdy/spdy-core/pom.xml21
-rw-r--r--jetty-spdy/spdy-example-webapp/pom.xml3
-rw-r--r--jetty-spdy/spdy-http-client-transport/pom.xml1
-rw-r--r--jetty-spdy/spdy-http-common/pom.xml2
-rw-r--r--jetty-spdy/spdy-http-server/pom.xml14
-rw-r--r--jetty-spdy/spdy-npn-tests/pom.xml3
-rw-r--r--jetty-spdy/spdy-server/pom.xml8
-rw-r--r--jetty-spring/pom.xml1
-rw-r--r--jetty-start/pom.xml7
-rw-r--r--jetty-util-ajax/pom.xml29
-rw-r--r--jetty-util/pom.xml12
-rw-r--r--jetty-webapp/pom.xml31
-rw-r--r--jetty-websocket/pom.xml10
-rw-r--r--jetty-websocket/websocket-server/pom.xml3
-rw-r--r--jetty-websocket/websocket-servlet/pom.xml17
-rw-r--r--jetty-xml/pom.xml24
-rw-r--r--pom.xml26
-rw-r--r--tests/test-continuation/pom.xml3
-rw-r--r--tests/test-integration/pom.xml2
-rw-r--r--tests/test-loginservice/pom.xml3
-rw-r--r--tests/test-sessions/test-hash-sessions/pom.xml3
-rw-r--r--tests/test-sessions/test-jdbc-sessions/pom.xml3
-rw-r--r--tests/test-sessions/test-mongodb-sessions/pom.xml3
-rw-r--r--tests/test-sessions/test-sessions-common/pom.xml3
-rw-r--r--tests/test-webapps/test-dispatch-webapp/pom.xml3
-rw-r--r--tests/test-webapps/test-jaas-webapp/pom.xml3
-rw-r--r--tests/test-webapps/test-jetty-webapp/pom.xml22
-rw-r--r--tests/test-webapps/test-jndi-webapp/pom.xml3
-rw-r--r--tests/test-webapps/test-mock-resources/pom.xml9
-rw-r--r--tests/test-webapps/test-proxy-webapp/pom.xml3
-rw-r--r--tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml3
-rw-r--r--tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml3
-rw-r--r--tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml3
-rw-r--r--tests/test-webapps/test-webapp-rfc2616/pom.xml3
81 files changed, 220 insertions, 863 deletions
diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml
index 93628bf57d..051b2b4dc8 100644
--- a/apache-jstl/pom.xml
+++ b/apache-jstl/pom.xml
@@ -9,6 +9,9 @@
<name>Apache :: JSTL module</name>
<url>http://tomcat.apache.org/taglibs/standard/</url>
<packaging>jar</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.apache.jstl</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml
index e9d5220edc..b105a911d8 100644
--- a/examples/async-rest/async-rest-jar/pom.xml
+++ b/examples/async-rest/async-rest-jar/pom.xml
@@ -10,6 +10,9 @@
<packaging>jar</packaging>
<name>Example Async Rest :: Jar</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.examples.asyc.rest</bundle-symbolic-name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
index 760ef797d7..35240bd3d7 100644
--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -11,6 +11,9 @@
<name>Example :: Jetty Embedded</name>
<description>Jetty Embedded Examples</description>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.examples.embedded</bundle-symbolic-name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml
index 9a1cc7c3c2..f859618108 100644
--- a/examples/quickstart/pom.xml
+++ b/examples/quickstart/pom.xml
@@ -11,6 +11,9 @@
<name>Example :: Jetty Quick Start</name>
<description>Jetty Quick Start Example</description>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.examples.quickstart</bundle-symbolic-name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml
index 63c74b64be..1946bebfaf 100644
--- a/jetty-alpn/jetty-alpn-client/pom.xml
+++ b/jetty-alpn/jetty-alpn-client/pom.xml
@@ -29,15 +29,6 @@
</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>
<!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
with a snapshot. -->
<plugin>
diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml
index ad0b78f718..dff18787e1 100644
--- a/jetty-alpn/jetty-alpn-server/pom.xml
+++ b/jetty-alpn/jetty-alpn-server/pom.xml
@@ -13,33 +13,6 @@
<build>
<plugins>
<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>org.eclipse.jetty.alpn,*</Import-Package>
- <_nouses>true</_nouses>
- </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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index b0522b04ed..e8199c053e 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -51,18 +51,6 @@
</executions>
</plugin>
<plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml
index 300b5013db..ea9b556fa4 100644
--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -9,6 +9,9 @@
<packaging>jar</packaging>
<name>Jetty :: Ant Plugin</name>
+ <properties>
+ <bundle-symbolic-name>org.eclipse.jetty.ant</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index b0d773c79e..b6e9bfea9d 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -49,16 +49,6 @@
</execution>
</executions>
</plugin>
- <!-- Required for OSGI -->
- <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>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 5fd2ee0a3f..7a0ae48c37 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -15,35 +15,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index fbdff7dbbd..58cc708480 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -50,18 +50,6 @@
</executions>
</plugin>
<plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
index 9706bdde77..c4a22f75f2 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -33,35 +33,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index d7c288ca10..26275c1ca2 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -27,44 +27,16 @@
<build>
<plugins>
<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.servlet.*;version="[2.6.0,3.2)",javax.net.*,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
<id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml
index 0f5372000d..7090fec993 100644
--- a/jetty-http2/http2-client/pom.xml
+++ b/jetty-http2/http2-client/pom.xml
@@ -12,35 +12,11 @@
<artifactId>http2-client</artifactId>
<name>Jetty :: HTTP2 :: Client</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
+ </properties>
+
<build>
- <plugins>
- <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.servlet.*;version="[2.6.0,3.2)",javax.net.*,*</Import-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>
<dependencies>
diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml
index 2a8baffa5c..f0b727025e 100644
--- a/jetty-http2/http2-common/pom.xml
+++ b/jetty-http2/http2-common/pom.xml
@@ -23,35 +23,11 @@
</dependency>
</dependencies>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.common</bundle-symbolic-name>
+ </properties>
+
<build>
- <plugins>
- <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.servlet.*;version="[2.6.0,3.2)",javax.net.*,*</Import-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>
</project>
diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml
index 0ae0e947ac..8178a67f32 100644
--- a/jetty-http2/http2-hpack/pom.xml
+++ b/jetty-http2/http2-hpack/pom.xml
@@ -10,6 +10,9 @@
<artifactId>http2-hpack</artifactId>
<name>Jetty :: HTTP2 :: HPACK</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.hpack</bundle-symbolic-name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -40,34 +43,6 @@
</dependencies>
<build>
- <plugins>
- <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.servlet.*;version="[2.6.0,3.2)",javax.net.*,*</Import-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>
</project>
diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml
index df00ecba34..8582fd37b3 100644
--- a/jetty-http2/http2-server/pom.xml
+++ b/jetty-http2/http2-server/pom.xml
@@ -12,6 +12,10 @@
<artifactId>http2-server</artifactId>
<name>Jetty :: HTTP2 :: Server</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -31,32 +35,6 @@
</execution>
</executions>
</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.servlet.*;version="[2.6.0,3.2)",javax.net.*,*</Import-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>
diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml
index 0e6574e1a7..0afe6331b6 100644
--- a/jetty-http2/pom.xml
+++ b/jetty-http2/pom.xml
@@ -19,37 +19,5 @@
<module>http2-server</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
- <instructions>
- <Export-Package>org.eclipse.jetty.http2.*"</Export-Package>
- <Import-Package>org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
- <_nouses>true</_nouses>
- </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>
</project>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 3b94edde47..f14faf79ae 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -31,35 +31,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml
index 04e827fbbe..a8393bf972 100644
--- a/jetty-jaas/pom.xml
+++ b/jetty-jaas/pom.xml
@@ -35,15 +35,6 @@
</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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index 37b062b768..b476e0bcc3 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -10,7 +10,7 @@
<description>Jetty security infrastructure</description>
<url>http://www.eclipse.org/jetty</url>
<properties>
- <bundle-symbolic-name>${project.groupId}.jaspi</bundle-symbolic-name>
+ <bundle-symbolic-name>${project.groupId}.security.jaspi</bundle-symbolic-name>
</properties>
<build>
<plugins>
@@ -32,36 +32,6 @@
</executions>
</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.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
- <Export-Package>org.eclipse.jetty.security.jaspi.*;version="${parsedVersion.osgiVersion}"</Export-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index e56bdadcf9..6664653437 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -15,35 +15,6 @@
<build>
<plugins>
<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.management.*,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 70a88f0c7f..1f2ba5fa77 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -32,35 +32,6 @@
</executions>
</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.naming.*,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index 9c279dcc71..52d71e58f3 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -9,6 +9,9 @@
<name>Jetty :: JSP dependencies</name>
<url>http://www.eclipse.org/jetty</url>
<packaging>jar</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.glassfish.jsp.parent</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml
index 015d5bf109..853f6f59d8 100644
--- a/jetty-jspc-maven-plugin/pom.xml
+++ b/jetty-jspc-maven-plugin/pom.xml
@@ -9,6 +9,7 @@
<packaging>maven-plugin</packaging>
<name>Jetty :: Jetty JSPC Maven Plugin</name>
<properties>
+ <bundle-symbolic-name>${project.groupId}.jspc.plugin</bundle-symbolic-name>
</properties>
<build>
<plugins>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index ea5274870a..baa1ba7265 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -11,6 +11,7 @@
<properties>
<mavenVersion>3.0.3</mavenVersion>
<pluginToolsVersion>3.1</pluginToolsVersion>
+ <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
</properties>
<build>
<plugins>
diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml
index 034b9e4d7e..1a0dedee79 100644
--- a/jetty-monitor/pom.xml
+++ b/jetty-monitor/pom.xml
@@ -32,35 +32,6 @@
<build>
<plugins>
<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.management.*,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index 92c7d77fd0..a04cfefd1e 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -31,40 +31,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.eclipse.jetty.server.session.jmx;resolution:=optional,org.eclipse.jetty.*,*</Import-Package>
- </instructions>
- </configuration>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
diff --git a/jetty-npn/jetty-npn-client/pom.xml b/jetty-npn/jetty-npn-client/pom.xml
index 26aab23bfa..1a7b8d67e4 100644
--- a/jetty-npn/jetty-npn-client/pom.xml
+++ b/jetty-npn/jetty-npn-client/pom.xml
@@ -29,15 +29,6 @@
</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>
<!-- always include the sources to be able to prepare the eclipse-jetty-SDK feature
with a snapshot. -->
<plugin>
diff --git a/jetty-npn/jetty-npn-server/pom.xml b/jetty-npn/jetty-npn-server/pom.xml
index a2d18dff8d..b887a07481 100644
--- a/jetty-npn/jetty-npn-server/pom.xml
+++ b/jetty-npn/jetty-npn-server/pom.xml
@@ -13,33 +13,6 @@
<build>
<plugins>
<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>org.eclipse.jetty.npn,*</Import-Package>
- <_nouses>true</_nouses>
- </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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml
index b863f69f66..5becb089c1 100644
--- a/jetty-osgi/jetty-osgi-alpn/pom.xml
+++ b/jetty-osgi/jetty-osgi-alpn/pom.xml
@@ -14,34 +14,26 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <archive>
- <manifestEntries>
- <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+ <instructions>
<Bundle-SymbolicName>${bundle-symbolic-name};singleton:=true</Bundle-SymbolicName>
<Bundle-Name>Jetty OSGi ALPN Fragment</Bundle-Name>
- <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+ <Import-Package>!javax.*;!org.eclipse.jetty.*</Import-Package>
<Export-Package>org.eclipse.jetty.alpn;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
- </manifestEntries>
- </archive>
+ </instructions>
</configuration>
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty.alpn</groupId>
+ <artifactId>alpn-api</artifactId>
+ <version>${alpn.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/jetty-osgi/jetty-osgi-npn/pom.xml b/jetty-osgi/jetty-osgi-npn/pom.xml
index a19818e04a..265351b835 100644
--- a/jetty-osgi/jetty-osgi-npn/pom.xml
+++ b/jetty-osgi/jetty-osgi-npn/pom.xml
@@ -14,34 +14,27 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>parse-version</id>
- <goals>
- <goal>parse-version</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<configuration>
- <archive>
- <manifestEntries>
- <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+ <instructions>
<Bundle-SymbolicName>${bundle-symbolic-name};singleton:=true</Bundle-SymbolicName>
<Bundle-Name>Jetty OSGi NPN Fragment</Bundle-Name>
- <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
- <Export-Package>org.eclipse.jetty.npn</Export-Package>
+ <Bundle-Description>${project.name}</Bundle-Description>
+ <Import-Package>!javax.*,!org.eclipse.jetty.*</Import-Package>
+ <Export-Package>org.eclipse.jetty.npn;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
- </manifestEntries>
- </archive>
+ </instructions>
</configuration>
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty.npn</groupId>
+ <artifactId>npn-api</artifactId>
+ <version>${npn.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java
index df05da8157..4e3a3a5d27 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootSpdy.java
@@ -44,7 +44,7 @@ import org.osgi.framework.BundleContext;
* SPDY setup.
*/
@RunWith(PaxExam.class)
-@Ignore
+//@Ignore
public class TestJettyOSGiBootSpdy
{
private static final String LOG_LEVEL = "WARN";
@@ -69,6 +69,8 @@ public class TestJettyOSGiBootSpdy
options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.util.component.LEVEL").value("DEBUG"))));
options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.server.LEVEL").value("DEBUG"))));
options.addAll(Arrays.asList(options(systemProperty("org.eclipse.jetty.xml.LEVEL").value("INFO"))));
+ // options.addAll(Arrays.asList(options(systemProperty("osgi.console").value("6666"))));
+ // options.addAll(Arrays.asList(options(systemProperty("osgi.console.enable.builtin").value("true"))));
return options.toArray(new Option[options.size()]);
}
@@ -108,14 +110,15 @@ public class TestJettyOSGiBootSpdy
@Test
public void assertAllBundlesActiveOrResolved()
{
- TestOSGiUtil.debugBundles(bundleContext);
+ // TestOSGiUtil.debugBundles(bundleContext);
TestOSGiUtil.assertAllBundlesActiveOrResolved(bundleContext);
}
@Test
public void testSpdyOnHttpService() throws Exception
{
- TestOSGiUtil.debugBundles(bundleContext);
+ // TestOSGiUtil.debugBundles(bundleContext);
+ // Thread.sleep(2000000000);
TestOSGiUtil.testHttpServiceGreetings(bundleContext, "https", TestJettyOSGiBootCore.DEFAULT_SSL_PORT);
}
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
index 0032744e4b..6b703cee13 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
@@ -146,11 +146,13 @@ public class TestJettyOSGiBootWithJsp
@Test
public void testJspDump() throws Exception
{
+ // TestOSGiUtil.debugBundles(bundleContext);
HttpClient client = new HttpClient();
try
{
client.start();
ContentResponse response = client.GET("http://127.0.0.1:" + TestJettyOSGiBootCore.DEFAULT_HTTP_PORT + "/jsp/dump.jsp");
+
assertEquals(HttpStatus.OK_200, response.getStatus());
String content = new String(response.getContent());
diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml
index a531f464f5..9f0a73b98c 100644
--- a/jetty-overlay-deployer/pom.xml
+++ b/jetty-overlay-deployer/pom.xml
@@ -10,6 +10,7 @@
<description>Overlayed deployer</description>
<url>http://www.eclipse.org/jetty</url>
<properties>
+ <bundle-symbolic-name>${project.groupId}.overlays</bundle-symbolic-name>
</properties>
<build>
<plugins>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index c7eadc372a..7999c68ecd 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -36,15 +36,6 @@
</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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml
index d2550a20fa..36612da4d4 100644
--- a/jetty-proxy/pom.xml
+++ b/jetty-proxy/pom.xml
@@ -15,35 +15,6 @@
<build>
<plugins>
<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.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml
index a67e95337d..2e5e2b6cf3 100644
--- a/jetty-quickstart/pom.xml
+++ b/jetty-quickstart/pom.xml
@@ -10,6 +10,9 @@
<name>Jetty :: Quick Start</name>
<description>Jetty Quick Start</description>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.quickstart</bundle-symbolic-name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 578009f528..9915097289 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -15,35 +15,6 @@
<build>
<plugins>
<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.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index 7c7350d2cd..a64b6ebf84 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -10,6 +10,7 @@
<properties>
<assembly-directory>target/distribution</assembly-directory>
+ <bundle-symbolic-name>${project.groupId}.runner</bundle-symbolic-name>
</properties>
<url>http://www.eclipse.org/jetty</url>
<build>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index e3361f53c7..480e2ff225 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -50,18 +50,6 @@
</executions>
</plugin>
<plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index c01cb9a766..0a200a105d 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -38,23 +38,12 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- <execution>
<id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 1bcc086683..73bc85058e 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -34,16 +34,8 @@
</executions>
</plugin>
<plugin>
- <!--
- Required for OSGI
- -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
<executions>
<execution>
<id>tests</id>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 4acf0c8f55..98bfefdf14 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -16,35 +16,6 @@
<build>
<plugins>
<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.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-spdy/pom.xml b/jetty-spdy/pom.xml
index a489055418..83eee34920 100644
--- a/jetty-spdy/pom.xml
+++ b/jetty-spdy/pom.xml
@@ -55,7 +55,6 @@
</goals>
<configuration>
<instructions>
- <Export-Package>org.eclipse.jetty.spdy.*</Export-Package>
<Import-Package>org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<_nouses>true</_nouses>
</instructions>
@@ -63,15 +62,6 @@
</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>
diff --git a/jetty-spdy/spdy-alpn-tests/pom.xml b/jetty-spdy/spdy-alpn-tests/pom.xml
index 0d02b5054c..1c0b55f254 100644
--- a/jetty-spdy/spdy-alpn-tests/pom.xml
+++ b/jetty-spdy/spdy-alpn-tests/pom.xml
@@ -9,6 +9,10 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>spdy-alpn-tests</artifactId>
<name>Jetty :: SPDY :: ALPN Tests</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.alpn.tests</bundle-symbolic-name>
+ </properties>
+
<build>
<plugins>
diff --git a/jetty-spdy/spdy-client/pom.xml b/jetty-spdy/spdy-client/pom.xml
index 4784dd7d27..14569025fa 100644
--- a/jetty-spdy/spdy-client/pom.xml
+++ b/jetty-spdy/spdy-client/pom.xml
@@ -28,8 +28,12 @@
</goals>
<configuration>
<instructions>
- <Export-Package>org.eclipse.jetty.spdy.client</Export-Package>
- <Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.npn.client;resolution:=optional,!org.eclipse.jetty.alpn,org.eclipse.jetty.alpn.client;resolution:=optional,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
+ <Import-Package>
+ !org.eclipse.jetty.npn,
+ org.eclipse.jetty.npn.client;resolution:=optional;version="[9.0,10.0)",
+ !org.eclipse.jetty.alpn,
+ org.eclipse.jetty.alpn.client;resolution:=optional;version="[9.0,10.0)",
+ org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
</instructions>
</configuration>
</execution>
diff --git a/jetty-spdy/spdy-core/pom.xml b/jetty-spdy/spdy-core/pom.xml
index 047b179920..38760a1e7b 100644
--- a/jetty-spdy/spdy-core/pom.xml
+++ b/jetty-spdy/spdy-core/pom.xml
@@ -13,6 +13,27 @@
<properties>
<bundle-symbolic-name>${project.groupId}.core</bundle-symbolic-name>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <instructions>
+ <Export-Package>org.eclipse.jetty.spdy.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml
index 4a25712d6a..bdda6079d4 100644
--- a/jetty-spdy/spdy-example-webapp/pom.xml
+++ b/jetty-spdy/spdy-example-webapp/pom.xml
@@ -9,6 +9,9 @@
<artifactId>spdy-example-webapp</artifactId>
<packaging>war</packaging>
<name>Jetty :: SPDY :: HTTP Web Application</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.example.webapp</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
diff --git a/jetty-spdy/spdy-http-client-transport/pom.xml b/jetty-spdy/spdy-http-client-transport/pom.xml
index 028b99817e..cb8aed7b18 100644
--- a/jetty-spdy/spdy-http-client-transport/pom.xml
+++ b/jetty-spdy/spdy-http-client-transport/pom.xml
@@ -27,7 +27,6 @@
</goals>
<configuration>
<instructions>
- <Export-Package>org.eclipse.jetty.spdy.client.http</Export-Package>
<Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
</instructions>
</configuration>
diff --git a/jetty-spdy/spdy-http-common/pom.xml b/jetty-spdy/spdy-http-common/pom.xml
index 0857515bd3..07fd45e93f 100644
--- a/jetty-spdy/spdy-http-common/pom.xml
+++ b/jetty-spdy/spdy-http-common/pom.xml
@@ -27,7 +27,7 @@
</goals>
<configuration>
<instructions>
- <Export-Package>org.eclipse.jetty.spdy.http</Export-Package>
+ <Export-Package>${project.groupId}.http.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
<Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
</instructions>
</configuration>
diff --git a/jetty-spdy/spdy-http-server/pom.xml b/jetty-spdy/spdy-http-server/pom.xml
index ffe9f134fe..148ff92242 100644
--- a/jetty-spdy/spdy-http-server/pom.xml
+++ b/jetty-spdy/spdy-http-server/pom.xml
@@ -10,7 +10,7 @@
<name>Jetty :: SPDY :: HTTP Server</name>
<properties>
- <bundle-symbolic-name>${project.groupId}.http.server</bundle-symbolic-name>
+ <bundle-symbolic-name>${project.groupId}.server.http</bundle-symbolic-name>
</properties>
<build>
@@ -39,7 +39,6 @@
<execution>
<id>artifact-jars</id>
<goals>
- <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
@@ -56,10 +55,13 @@
</goals>
<configuration>
<instructions>
- <Export-Package>org.eclipse.jetty.spdy.server.http,
- org.eclipse.jetty.spdy.server.proxy;version="9.3"
- </Export-Package>
- <Import-Package>!org.eclipse.jetty.npn,org.eclipse.jetty.*;version="[9.0,10.0)",*
+ <Export-Package>
+ ${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+ ${project.groupId}.server.proxy.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+ <Import-Package>
+ !org.eclipse.jetty.alpn.*,
+ !org.eclipse.jetty.npn.*,
+ org.eclipse.jetty.*;version="[9.0,10.0)",*
</Import-Package>
<_nouses>true</_nouses>
</instructions>
diff --git a/jetty-spdy/spdy-npn-tests/pom.xml b/jetty-spdy/spdy-npn-tests/pom.xml
index f11d9a0e6d..3594a6ef30 100644
--- a/jetty-spdy/spdy-npn-tests/pom.xml
+++ b/jetty-spdy/spdy-npn-tests/pom.xml
@@ -10,6 +10,9 @@
<artifactId>spdy-npn-tests</artifactId>
<name>Jetty :: SPDY :: NPN Tests</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.npn.tests</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/jetty-spdy/spdy-server/pom.xml b/jetty-spdy/spdy-server/pom.xml
index 5f8e53972f..a220717a22 100644
--- a/jetty-spdy/spdy-server/pom.xml
+++ b/jetty-spdy/spdy-server/pom.xml
@@ -28,8 +28,12 @@
</goals>
<configuration>
<instructions>
- <Export-Package>org.eclipse.jetty.spdy.server</Export-Package>
- <Import-Package>org.eclipse.jetty.alpn;resolution:=optional,org.eclipse.jetty.alpn.server;resolution:=optional, org.eclipse.jetty.npn;resolution:=optional,org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
+ <Import-Package>
+ org.eclipse.jetty.alpn;resolution:=optional;version="[9.0,10.0)",
+ org.eclipse.jetty.alpn.server;resolution:=optional;version="[9.0,10.0)",
+ org.eclipse.jetty.npn;resolution:=optional;version="[9.0,10.0)",
+ org.eclipse.jetty.npn.server;resolution:=optional;version="[9.0,10.0)",
+ org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<_nouses>true</_nouses>
</instructions>
</configuration>
diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml
index 0adc885f03..df362cb6d2 100644
--- a/jetty-spring/pom.xml
+++ b/jetty-spring/pom.xml
@@ -11,6 +11,7 @@
<properties>
<spring-version>3.2.8.RELEASE</spring-version>
<dependencies>target/dependencies</dependencies>
+ <bundle-symbolic-name>${project.groupId}.spring</bundle-symbolic-name>
</properties>
<build>
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index 75cc0e4e3a..a69db463ea 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -9,6 +9,10 @@
<name>Jetty :: Start</name>
<description>The start utility</description>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.start</bundle-symbolic-name>
+ <start-jar-file-name>start.jar</start-jar-file-name>
+ </properties>
<build>
<plugins>
<plugin>
@@ -30,9 +34,6 @@
</plugin>
</plugins>
</build>
- <properties>
- <start-jar-file-name>start.jar</start-jar-file-name>
- </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml
index a0ad0e8410..ee95fe379d 100644
--- a/jetty-util-ajax/pom.xml
+++ b/jetty-util-ajax/pom.xml
@@ -14,35 +14,6 @@
</properties>
<build>
<plugins>
- <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.servlet.*;version="[2.6.0,3.2)",org.slf4j;version="[1.5,2.0)";resolution:=optional,org.slf4j.impl;version="[1.5,2.0)";resolution:=optional,*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index f0a4e25a18..c4f991b69b 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -32,18 +32,6 @@
</executions>
</plugin>
<plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 93b646dda5..ffbc21d9e4 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -45,37 +45,6 @@
</executions>
</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.servlet.*;version="[2.6.0,3.2]",*</Import-Package>
- </instructions>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 7a209faeb2..6925879e1b 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -43,7 +43,6 @@
</goals>
<configuration>
<instructions>
- <Export-Package>${bundle-symbolic-name}.*</Export-Package>
<Import-Package>javax.servlet.*;version="[3.0,4.0)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<_nouses>true</_nouses>
</instructions>
@@ -52,15 +51,6 @@
</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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<version>2.5</version>
diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml
index e6338d50d6..76efde8a16 100644
--- a/jetty-websocket/websocket-server/pom.xml
+++ b/jetty-websocket/websocket-server/pom.xml
@@ -21,9 +21,8 @@
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <id>artifact-jars</id>
+ <id>test-jar</id>
<goals>
- <goal>jar</goal>
<goal>test-jar</goal>
</goals>
</execution>
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index 97bf9cff6c..00a90ce735 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -15,23 +15,6 @@
</properties>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>artifact-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 6d77d41275..f4ad571ab8 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -15,30 +15,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Required for OSGI
- -->
- <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>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
diff --git a/pom.xml b/pom.xml
index 68567b05f9..62811d3a1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,6 +236,27 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </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>
<pluginManagement>
<plugins>
@@ -284,8 +305,13 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ <supportedProjectType>maven-plugin</supportedProjectType>
+ </supportedProjectTypes>
<instructions>
<Bundle-SymbolicName>${bundle-symbolic-name}</Bundle-SymbolicName>
+ <Bundle-Description>Jetty module for ${project.name}</Bundle-Description>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
<Bundle-DocURL>${jetty.url}</Bundle-DocURL>
<Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml
index 1f7cb0b045..6a9c8f75fc 100644
--- a/tests/test-continuation/pom.xml
+++ b/tests/test-continuation/pom.xml
@@ -28,6 +28,9 @@
<packaging>jar</packaging>
<name>Test :: Continuation</name>
<description>Asynchronous API</description>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.continuation</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index e08d8585f5..dfe8aed823 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -31,6 +31,8 @@
<test-wars-dir>${project.build.directory}/test-wars</test-wars-dir>
<test-libs-dir>${project.build.directory}/test-libs</test-libs-dir>
<test-dist-dir>${project.build.directory}/test-dist</test-dist-dir>
+ <bundle-symbolic-name>${project.groupId}.integrations</bundle-symbolic-name>
+
</properties>
<build>
<plugins>
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index 75fc5d9503..be9a618fb1 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-loginservice</artifactId>
<name>Jetty Tests :: Login Service</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.loginservice</bundle-symbolic-name>
+ </properties>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index d03667ed5e..ea44811620 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-hash-sessions</artifactId>
<name>Jetty Tests :: Sessions :: Hash</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.hash</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index 39f905d0e8..2d69ff7acc 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-jdbc-sessions</artifactId>
<name>Jetty Tests :: Sessions :: JDBC</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.jdbc</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml
index e08bc42b7e..30bb7f355f 100644
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-mongodb-sessions</artifactId>
<name>Jetty Tests :: Sessions :: Mongo</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.mongo</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index e608d5d357..e15e013941 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -26,6 +26,9 @@
<artifactId>test-sessions-common</artifactId>
<name>Jetty Tests :: Sessions :: Common</name>
<url>http://www.eclipse.org/jetty</url>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sessions.common</bundle-symbolic-name>
+ </properties>
<build>
</build>
<dependencies>
diff --git a/tests/test-webapps/test-dispatch-webapp/pom.xml b/tests/test-webapps/test-dispatch-webapp/pom.xml
index 497fdd572d..5afe024043 100644
--- a/tests/test-webapps/test-dispatch-webapp/pom.xml
+++ b/tests/test-webapps/test-dispatch-webapp/pom.xml
@@ -9,6 +9,9 @@
<name>Jetty Tests :: Webapps :: Dispatch Webapp</name>
<artifactId>test-dispatch-webapp</artifactId>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.dispatch</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml
index 34ab3005e4..7c1e889c73 100644
--- a/tests/test-webapps/test-jaas-webapp/pom.xml
+++ b/tests/test-webapps/test-jaas-webapp/pom.xml
@@ -9,6 +9,9 @@
<artifactId>test-jaas-webapp</artifactId>
<name>Jetty Tests :: WebApp :: JAAS</name>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.jaas</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml
index 49ee81234c..5affbf425a 100644
--- a/tests/test-webapps/test-jetty-webapp/pom.xml
+++ b/tests/test-webapps/test-jetty-webapp/pom.xml
@@ -29,6 +29,9 @@
<name>Test :: Jetty Test Webapp</name>
<url>http://www.eclipse.org/jetty</url>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.tests.webapp</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
@@ -70,15 +73,6 @@
</execution>
</executions>
</plugin>
- <!-- also make this webapp an osgi bundle -->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -97,7 +91,6 @@
</goals>
<configuration>
<instructions>
- <Bundle-SymbolicName>org.eclipse.jetty.test-jetty-webapp</Bundle-SymbolicName>
<Import-Package>javax.servlet.jsp.*;version="[2.2.0,3.0)",javax.servlet.*;version="[2.6,3.2)",org.eclipse.jetty.*;version="[9.0,10.0)",*</Import-Package>
<Export-Package>!com.acme*</Export-Package>
<!-- the test webapp is configured via a jetty xml file
@@ -114,6 +107,15 @@
</execution>
</executions>
</plugin>
+ <!-- also make this webapp an osgi bundle -->
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml
index dfcea3f648..4c4e5e27ea 100644
--- a/tests/test-webapps/test-jndi-webapp/pom.xml
+++ b/tests/test-webapps/test-jndi-webapp/pom.xml
@@ -9,6 +9,9 @@
<artifactId>test-jndi-webapp</artifactId>
<name>Jetty Tests :: WebApp :: JNDI</name>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.jndi</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml
index 3083716570..2e4c235702 100644
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@@ -8,6 +8,9 @@
<name>Jetty Tests :: WebApp :: Mock Resources</name>
<artifactId>test-mock-resources</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.mocks</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
@@ -28,12 +31,6 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
- </dependency>
--->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.mail.glassfish</artifactId>
diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml
index a3448f8fba..aca97c050d 100644
--- a/tests/test-webapps/test-proxy-webapp/pom.xml
+++ b/tests/test-webapps/test-proxy-webapp/pom.xml
@@ -28,6 +28,9 @@
<artifactId>test-proxy-webapp</artifactId>
<name>Test :: Jetty Proxy Webapp</name>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.proxy</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
index 7f5f90cbaf..b1af392f37 100644
--- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
@@ -8,6 +8,9 @@
<artifactId>test-container-initializer</artifactId>
<packaging>jar</packaging>
<name>Jetty Tests :: WebApp :: Servlet Spec :: ServletContainerInitializer Test Jar</name>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.sci</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
index 7a9dcc3a2e..a2ae9b9e2c 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
@@ -9,6 +9,9 @@
<name>Jetty Tests :: Webapps :: Spec Webapp</name>
<artifactId>test-spec-webapp</artifactId>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.spec</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
index e9469b8b8a..64cc72f8b2 100644
--- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
@@ -9,6 +9,9 @@
<groupId>org.eclipse.jetty.tests</groupId>
<artifactId>test-web-fragment</artifactId>
<packaging>jar</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.fragment</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 803813f565..b7a3e8325e 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -27,6 +27,9 @@
<name>Jetty Tests :: WebApp :: RFC2616</name>
<url>http://www.eclipse.org/jetty</url>
<packaging>war</packaging>
+ <properties>
+ <bundle-symbolic-name>${project.groupId}.rfc2616</bundle-symbolic-name>
+ </properties>
<build>
<plugins>
<plugin>

Back to the top