Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2012-11-28 23:52:44 +0000
committerJoakim Erdfelt2012-11-28 23:55:13 +0000
commit11cbe274af26df8f850ff43d9ce24956d7063f86 (patch)
tree35337a0c7242bf1c6b1b97f470d95a5f610cf32a /pom.xml
parent0805f131a8317ca9d6ca73be6931f00229215419 (diff)
downloadorg.eclipse.jetty.project-11cbe274af26df8f850ff43d9ce24956d7063f86.tar.gz
org.eclipse.jetty.project-11cbe274af26df8f850ff43d9ce24956d7063f86.tar.xz
org.eclipse.jetty.project-11cbe274af26df8f850ff43d9ce24956d7063f86.zip
395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml9
1 files changed, 2 insertions, 7 deletions
diff --git a/pom.xml b/pom.xml
index 5b1e4f6d94..4e778abde0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,8 @@
<!-- allowed combinations -->
<includes>
<include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar:*</include>
+ <include>javax.net.websocket:*:*:*</include>
+ <include>javax.websocket:*:*:*</include>
<include>javax.servlet:*:*:*:provided</include>
<include>javax.servlet.jsp:*:*:*:provided</include>
</includes>
@@ -496,13 +498,6 @@
</dependency>
-->
- <!-- Draft Deps -->
- <dependency>
- <groupId>org.eclipse.jetty.drafts</groupId>
- <artifactId>javax.websocket-api</artifactId>
- <version>0.0.006.draft</version>
- </dependency>
-
<!-- Old Deps -->
<dependency>
<groupId>org.apache.maven</groupId>

Back to the top