Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes bc3ccc3ab -> fcf585eb1


add jax_rs/websocket_osgi in samples/pom.xml


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

Branch: refs/heads/3.1.x-fixes
Commit: fcf585eb1b260c320281f1a5128307e9ae082547
Parents: bc3ccc3
Author: Akitoshi Yoshida <a...@apache.org>
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida <a...@apache.org>
Committed: Fri Jul 29 00:16:20 2016 +0200

----------------------------------------------------------------------
 .../main/release/samples/jax_rs/websocket_osgi/pom.xml  |  8 ++++----
 .../main/release/samples/jax_rs/websocket_web/pom.xml   | 12 ++++++------
 distribution/src/main/release/samples/pom.xml           |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
----------------------------------------------------------------------
diff --git 
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index 16e1988..f63bfc1 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.7-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -68,17 +68,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.7-SNAPSHOT</version>
+            <version>3.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>3.1.7-SNAPSHOT</version>
+            <version>3.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.7-SNAPSHOT</version>
+            <version>3.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 7b76bbc..0b57c11 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,13 +20,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jax_rs_websocket_web</artifactId>
-    <name>JAX-RS WebSocket Demo</name>
-    <description>JAX-RS WebSocket WebApp Demo</description>
+    <name>JAX-RS WebSocket WebApp Demo</name>
+    <description>JAX-RS WebSocket Demo</description>
     <packaging>war</packaging>
     <parent>
         <groupId>org.apache.cxf.samples</groupId>
         <artifactId>cxf-samples</artifactId>
-        <version>3.1.7-SNAPSHOT</version>
+        <version>3.1.8-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <properties>
@@ -82,17 +82,17 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>3.1.7-SNAPSHOT</version>
+            <version>3.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-websocket</artifactId>
-            <version>3.1.7-SNAPSHOT</version>
+            <version>3.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>3.1.7-SNAPSHOT</version>
+            <version>3.1.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 668792b..88d1ac0 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -51,6 +51,8 @@
         <module>jax_rs/basic_https</module>
         <module>jax_rs/basic</module>
         <module>jax_rs/websocket</module>
+        <module>jax_rs/websocket_web</module>
+        <module>jax_rs/websocket_osgi</module>
         <module>jax_rs/search</module>
         <module>jax_rs/description_swagger</module>
         <module>jax_rs/description_swagger2</module>

Reply via email to