diff options
| author | Joakim Erdfelt | 2015-03-16 17:25:15 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-03-16 17:25:15 +0000 |
| commit | 6e952d461817169f0dd19d2771ae3943aad40e38 (patch) | |
| tree | 3c9ef2238aff33310330bc37fb5f2ff861740f4a /jetty-websocket/websocket-server | |
| parent | 81f29576e6b7a1ee1da32b19843801becd000412 (diff) | |
| parent | 4a4131750195cc27c23ac417df4bde55a2a79c13 (diff) | |
| download | org.eclipse.jetty.project-6e952d461817169f0dd19d2771ae3943aad40e38.tar.gz org.eclipse.jetty.project-6e952d461817169f0dd19d2771ae3943aad40e38.tar.xz org.eclipse.jetty.project-6e952d461817169f0dd19d2771ae3943aad40e38.zip | |
Merge branch 'jetty-9.2.x'
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
Diffstat (limited to 'jetty-websocket/websocket-server')
| -rw-r--r-- | jetty-websocket/websocket-server/pom.xml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index 76efde8a16..f170b82f19 100644 --- a/jetty-websocket/websocket-server/pom.xml +++ b/jetty-websocket/websocket-server/pom.xml @@ -16,6 +16,26 @@ <build> <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <executions> + <execution> + <id>generate-manifest</id> + <goals> + <goal>manifest</goal> + </goals> + <configuration> + <instructions> + <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability> + <Provide-Capability>osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.websocket.servlet.WebSocketServletFactory</Provide-Capability> + <_nouses>true</_nouses> + </instructions> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> |