Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2015-03-16 17:25:15 +0000
committerJoakim Erdfelt2015-03-16 17:25:15 +0000
commit6e952d461817169f0dd19d2771ae3943aad40e38 (patch)
tree3c9ef2238aff33310330bc37fb5f2ff861740f4a /jetty-websocket
parent81f29576e6b7a1ee1da32b19843801becd000412 (diff)
parent4a4131750195cc27c23ac417df4bde55a2a79c13 (diff)
downloadorg.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')
-rw-r--r--jetty-websocket/websocket-server/pom.xml20
-rw-r--r--jetty-websocket/websocket-servlet/pom.xml1
2 files changed, 21 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>
diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml
index f91ff8493a..0872094b1b 100644
--- a/jetty-websocket/websocket-servlet/pom.xml
+++ b/jetty-websocket/websocket-servlet/pom.xml
@@ -25,6 +25,7 @@
<Bundle-Classpath />
<_nouses>true</_nouses>
<DynamicImport-Package>org.eclipse.jetty.websocket.server.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}",org.eclipse.jetty.websocket.server.pathmap.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}"</DynamicImport-Package>
+ <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.websocket.servlet.WebSocketServletFactory)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
</instructions>
</configuration>
</plugin>

Back to the top