Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2014-03-14 01:03:15 +0000
committerJan Bartel2014-03-14 01:03:15 +0000
commit79b765d5585ce1954c00099ea5c954135de2ac5f (patch)
tree47acd54dd194211d7207cb4c60f4550f7be1df84
parent663a36bdf6310e5135bbe5bde4faba06685b5bb7 (diff)
downloadorg.eclipse.jetty.releng.bundles-79b765d5585ce1954c00099ea5c954135de2ac5f.tar.gz
org.eclipse.jetty.releng.bundles-79b765d5585ce1954c00099ea5c954135de2ac5f.tar.xz
org.eclipse.jetty.releng.bundles-79b765d5585ce1954c00099ea5c954135de2ac5f.zip
Temporarily commenting out addition of javax.websocket bundles as releases prior to 9.1.4 do not contain correct import/export statements.
-rw-r--r--jetty.bundles.f.source/feature.xml3
-rw-r--r--jetty.bundles.f/feature.xml4
-rw-r--r--pom.xml6
3 files changed, 12 insertions, 1 deletions
diff --git a/jetty.bundles.f.source/feature.xml b/jetty.bundles.f.source/feature.xml
index f255f99..8bcd8ea 100644
--- a/jetty.bundles.f.source/feature.xml
+++ b/jetty.bundles.f.source/feature.xml
@@ -264,6 +264,8 @@ it has to be on the boot classpath of the JVM -->
install-size="0"
version="0.0.0"
unpack="false"/>
+<!-- Temporarily commented out until 9.1.4 release which contains correct import/export statements -->
+<!--
<plugin
id="org.eclipse.jetty.websocket.javax.websocket.server.source"
@@ -278,6 +280,7 @@ it has to be on the boot classpath of the JVM -->
install-size="0"
version="0.0.0"
unpack="false"/>
+-->
<plugin
id="org.eclipse.jetty.xml.source"
diff --git a/jetty.bundles.f/feature.xml b/jetty.bundles.f/feature.xml
index 152da67..1a2d73a 100644
--- a/jetty.bundles.f/feature.xml
+++ b/jetty.bundles.f/feature.xml
@@ -290,7 +290,8 @@ it has to be on the boot classpath of the JVM
install-size="0"
version="0.0.0"
unpack="false"/>
-
+<!-- Temporarily commented out until 9.1.4 build is released which contains correct import/export statements -->
+<!--
<plugin
id="org.eclipse.jetty.websocket.javax.websocket.server"
download-size="0"
@@ -304,6 +305,7 @@ it has to be on the boot classpath of the JVM
install-size="0"
version="0.0.0"
unpack="false"/>
+-->
<plugin
id="org.eclipse.jetty.xml"
diff --git a/pom.xml b/pom.xml
index 6d61264..d7d51d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,6 +277,8 @@
<artifactId>websocket-servlet</artifactId>
<version>${jetty-version}</version>
</dependency>
+<!-- Temporarily commented out until 9.1.4 release which contains correct import/export statements -->
+<!--
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
@@ -287,6 +289,7 @@
<artifactId>javax-websocket-client-impl</artifactId>
<version>${jetty-version}</version>
</dependency>
+-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>
@@ -537,6 +540,8 @@
<version>${jetty-version}</version>
<classifier>sources</classifier>
</dependency>
+<!-- Temporarily commented out until 9.1.4 release which contains correct import/export statements -->
+<!--
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>javax-websocket-server-impl</artifactId>
@@ -549,6 +554,7 @@
<version>${jetty-version}</version>
<classifier>sources</classifier>
</dependency>
+-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-xml</artifactId>

Back to the top