1.1 --- a/chat/server/pom.xml Fri Apr 22 05:56:47 2016 +0200
1.2 +++ b/chat/server/pom.xml Fri Apr 22 08:53:13 2016 +0200
1.3 @@ -8,82 +8,89 @@
1.4 </parent>
1.5 <artifactId>chat-server</artifactId>
1.6 <packaging>jar</packaging>
1.7 - <name>chat Jersey based Server</name>
1.8 + <name>Chat WebSocket Server</name>
1.9 <properties>
1.10 <maven.compiler.source>1.7</maven.compiler.source>
1.11 <maven.compiler.target>1.7</maven.compiler.target>
1.12 + <grizzly.version>2.3.8</grizzly.version>
1.13 </properties>
1.14 - <dependencies>
1.15 - <dependency>
1.16 - <groupId>org.netbeans.html</groupId>
1.17 - <artifactId>net.java.html.json</artifactId>
1.18 - <version>${net.java.html.version}</version>
1.19 - <type>jar</type>
1.20 - </dependency>
1.21 - <dependency>
1.22 - <groupId>org.glassfish.jersey.media</groupId>
1.23 - <artifactId>html-json</artifactId>
1.24 - <version>${jersey.version}</version>
1.25 - <scope>runtime</scope>
1.26 - <exclusions>
1.27 - <!-- use explicitly specified versions -->
1.28 - <exclusion>
1.29 - <groupId>org.netbeans.html</groupId>
1.30 - <artifactId>net.java.html.json</artifactId>
1.31 - </exclusion>
1.32 - <exclusion>
1.33 - <groupId>org.netbeans.html</groupId>
1.34 - <artifactId>ko-ws-tyrus</artifactId>
1.35 - </exclusion>
1.36 - </exclusions>
1.37 - </dependency>
1.38 - <dependency>
1.39 - <groupId>org.testng</groupId>
1.40 - <artifactId>testng</artifactId>
1.41 - <scope>test</scope>
1.42 - </dependency>
1.43 - <dependency>
1.44 - <groupId>org.glassfish.jersey.connectors</groupId>
1.45 - <artifactId>jersey-grizzly-connector</artifactId>
1.46 - <version>${jersey.version}</version>
1.47 - </dependency>
1.48 - <dependency>
1.49 - <groupId>org.glassfish.jersey.containers</groupId>
1.50 - <artifactId>jersey-container-grizzly2-http</artifactId>
1.51 - <version>${jersey.version}</version>
1.52 - <type>jar</type>
1.53 - </dependency>
1.54 - <dependency>
1.55 - <groupId>org.glassfish.jersey.core</groupId>
1.56 - <artifactId>jersey-common</artifactId>
1.57 - <version>${jersey.version}</version>
1.58 - <scope>runtime</scope>
1.59 - </dependency>
1.60 - <dependency>
1.61 - <artifactId>ko-ws-tyrus</artifactId>
1.62 - <groupId>org.netbeans.html</groupId>
1.63 - <type>jar</type>
1.64 - <version>${net.java.html.version}</version>
1.65 - <scope>runtime</scope>
1.66 - <exclusions>
1.67 - <!-- use explicitly specified versions -->
1.68 - <exclusion>
1.69 - <groupId>org.glassfish.grizzly</groupId>
1.70 - <artifactId>grizzly-framework</artifactId>
1.71 - </exclusion>
1.72 - <exclusion>
1.73 - <groupId>org.glassfish.grizzly</groupId>
1.74 - <artifactId>grizzly-http-server</artifactId>
1.75 - </exclusion>
1.76 - </exclusions>
1.77 - </dependency>
1.78 - <dependency>
1.79 - <groupId>org.apidesign.demo</groupId>
1.80 - <artifactId>chat-shared</artifactId>
1.81 - <version>${project.version}</version>
1.82 - <type>jar</type>
1.83 - </dependency>
1.84 - </dependencies>
1.85 + <dependencies>
1.86 + <!-- compile + runtime -->
1.87 + <dependency>
1.88 + <groupId>org.netbeans.html</groupId>
1.89 + <artifactId>net.java.html</artifactId>
1.90 + <version>${net.java.html.version}</version>
1.91 + <type>jar</type>
1.92 + </dependency>
1.93 + <dependency>
1.94 + <groupId>org.netbeans.html</groupId>
1.95 + <artifactId>net.java.html.json</artifactId>
1.96 + <version>${net.java.html.version}</version>
1.97 + <type>jar</type>
1.98 + </dependency>
1.99 + <dependency>
1.100 + <artifactId>javax.websocket-api</artifactId>
1.101 + <groupId>javax.websocket</groupId>
1.102 + <type>jar</type>
1.103 + <version>1.0</version>
1.104 + </dependency>
1.105 +
1.106 + <!-- tyrus runtime -->
1.107 + <dependency>
1.108 + <groupId>org.glassfish.tyrus</groupId>
1.109 + <artifactId>tyrus-client</artifactId>
1.110 + <version>1.3.1</version>
1.111 + <scope>runtime</scope>
1.112 + </dependency>
1.113 + <dependency>
1.114 + <groupId>org.glassfish.tyrus</groupId>
1.115 + <artifactId>tyrus-container-grizzly-client</artifactId>
1.116 + <version>1.3.1</version>
1.117 + <scope>runtime</scope>
1.118 + </dependency>
1.119 +
1.120 +
1.121 +
1.122 + <!-- test only deps -->
1.123 + <dependency>
1.124 + <groupId>org.netbeans.html</groupId>
1.125 + <artifactId>ko4j</artifactId>
1.126 + <version>${net.java.html.version}</version>
1.127 + <type>jar</type>
1.128 + </dependency>
1.129 + <dependency>
1.130 + <groupId>org.glassfish.grizzly</groupId>
1.131 + <artifactId>grizzly-http-server-core</artifactId>
1.132 + <version>${grizzly.version}</version>
1.133 + <type>jar</type>
1.134 + </dependency>
1.135 + <dependency>
1.136 + <groupId>org.glassfish.grizzly</groupId>
1.137 + <artifactId>grizzly-websockets-server</artifactId>
1.138 + <version>${grizzly.version}</version>
1.139 + <type>jar</type>
1.140 + </dependency>
1.141 + <dependency>
1.142 + <groupId>org.glassfish.grizzly</groupId>
1.143 + <artifactId>grizzly-http-server</artifactId>
1.144 + <version>${grizzly.version}</version>
1.145 + </dependency>
1.146 + <dependency>
1.147 + <groupId>org.glassfish.grizzly</groupId>
1.148 + <artifactId>grizzly-http-servlet</artifactId>
1.149 + <version>${grizzly.version}</version>
1.150 + </dependency>
1.151 + <dependency>
1.152 + <groupId>javax.servlet</groupId>
1.153 + <artifactId>javax.servlet-api</artifactId>
1.154 + <version>3.1.0</version>
1.155 + </dependency>
1.156 + <dependency>
1.157 + <groupId>${project.groupId}</groupId>
1.158 + <artifactId>chat-shared</artifactId>
1.159 + <version>${project.version}</version>
1.160 + </dependency>
1.161 + </dependencies>
1.162 <build>
1.163 <plugins>
1.164 <plugin>