cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject git commit: an option to switch jetty version for the sample jaxrs websocket
Date Wed, 13 Aug 2014 11:56:37 GMT
Repository: cxf
Updated Branches:
  refs/heads/master a04c01f9c -> ba8fc3d35


an option to switch jetty version for the sample jaxrs websocket


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ba8fc3d3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ba8fc3d3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ba8fc3d3

Branch: refs/heads/master
Commit: ba8fc3d351121ec8eb2ce37cd12e014f722c741d
Parents: a04c01f
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Wed Aug 13 13:52:22 2014 +0200
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Wed Aug 13 13:56:33 2014 +0200

----------------------------------------------------------------------
 .../release/samples/jax_rs/websocket/pom.xml    | 82 ++++++++++++++++++--
 1 file changed, 77 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ba8fc3d3/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index f8a1c3b..297fda5 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -33,10 +33,51 @@
         <!-- TODO remove these local entries after making the referenced dependency managed
in parent/pom.xml -->
         <cxf.ahc.version>1.8.5</cxf.ahc.version>
         <cxf.jetty8.version>8.1.15.v20140411</cxf.jetty8.version>
+        <cxf.jetty9.version>9.2.2.v20140723</cxf.jetty9.version>
+        <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
         <cxf.netty3.version>3.9.1.Final</cxf.netty3.version>
     </properties>
     <profiles>
         <profile>
+            <id>jetty8</id>
+            <activation>
+                <property>
+                    <name>!jetty9</name>
+                </property>
+            </activation>
+            <properties>
+                <cxf.jetty.version>${cxf.jetty8.version}</cxf.jetty.version>
+            </properties>
+            <dependencies>
+                <!-- jetty8 websocket -->
+                <dependency>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-websocket</artifactId>
+                    <version>${cxf.jetty8.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>jetty9</id>
+            <properties>
+                <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
+            </properties>
+            <dependencies>
+                <!-- jetty9 websocket -->
+                <dependency>
+                    <groupId>org.eclipse.jetty.websocket</groupId>
+                    <artifactId>websocket-server</artifactId>
+                    <version>${cxf.jetty9.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>javax.servlet</groupId>
+                            <artifactId>javax.servlet-api</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
             <id>server</id>
             <build>
                 <defaultGoal>test</defaultGoal>
@@ -91,6 +132,42 @@
         </dependency>
         <!-- This dependency is needed if you're using the Jetty container -->
         <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${cxf.jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+            <version>${cxf.jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-security</artifactId>
+            <version>${cxf.jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-plus</artifactId>
+            <version>${cxf.jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>${cxf.jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>${cxf.jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${cxf.jetty.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
             <version>3.1.0-SNAPSHOT</version>
@@ -105,11 +182,6 @@
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-	    <artifactId>jetty-websocket</artifactId>
-	    <version>${cxf.jetty8.version}</version>
-	</dependency>
-        <dependency>
             <groupId>com.ning</groupId>
             <artifactId>async-http-client</artifactId>
             <version>${cxf.ahc.version}</version>


Mime
View raw message