--- a/server/pom.xml	Wed Feb 13 13:41:19 2013 +0100
+++ b/server/pom.xml	Thu Feb 14 01:20:14 2013 +0100
@@ -9,13 +9,14 @@
 
     <properties>       
         <coweb-version>1.0</coweb-version>
-        <cowebx-version>0.8.4</cowebx-version>
-        <jersey-version>1.16</jersey-version>
-        <spring-version>3.1.3.RELEASE</spring-version>
-        <!--jetty-version>9.0.0.M4</jetty-version-->
-        <jetty-version>8.1.8.v20121106</jetty-version>
+        <cowebx-version>1.0</cowebx-version>
+        <jersey-version>1.17</jersey-version>
+        <spring-version>3.2.1.RELEASE</spring-version>
+        <!--jetty-version>9.0.0.RC0</jetty-version-->
+        <jetty-version>8.1.9.v20130131</jetty-version>
         <junit-version>4.10</junit-version>
-        <thymeleaf-version>2.0.14</thymeleaf-version>
+        <thymeleaf-version>2.0.15</thymeleaf-version>
+        <cometd-version>2.5.1</cometd-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -25,10 +26,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.0</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
 
@@ -38,15 +39,15 @@
                 <version>${jetty-version}</version>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
-                    <webAppConfig>
+                    <webApp>
                         <contextPath>/renkan</contextPath>
-                    </webAppConfig>
+                    </webApp>
                 </configuration>
             </plugin>
             
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.3</version>
                 <configuration>
                     <overlays>
                         <overlay>
@@ -70,11 +71,35 @@
                             <targetPath>lib/cowebx/dojo</targetPath>
                         </overlay>
                     </overlays>
+                    <webResources>
+                        <resource>
+                            <directory>../client/js</directory>
+                            <includes>
+                                <include>i18n.js</include>
+                                <include>*-bin.js</include>
+                                <include>models.js</include>
+                                <include>paper-renderer.js</include>
+                                <include>main.js</include>
+                            </includes>
+                            <targetPath>static/js</targetPath>
+                        </resource>
+                        <resource>
+                            <directory>../client/css</directory>
+                            <includes>
+                                <include>*.css</include>
+                            </includes>
+                            <targetPath>static/css</targetPath>
+                        </resource>
+                        <resource>
+                            <directory>../client/img</directory>
+                            <targetPath>static/img</targetPath>
+                        </resource>
+                    </webResources>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    <repositories>
+    <repositories>    
         <repository>
             <id>spring-maven-release</id>
             <name>Spring Maven Release Repository</name>
@@ -85,6 +110,11 @@
             <name>Spring Maven MILESTONE Repository</name>
             <url>http://maven.springframework.org/milestone</url>
         </repository>
+        <repository>
+            <id>spring-release</id>
+            <name>Spring Maven SNAPSHOT Repository</name>
+            <url>http://repo.springsource.org/release</url>
+        </repository>        
     </repositories>
     <dependencies>
         <dependency>  
@@ -94,14 +124,24 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-java-common</artifactId>
+            <version>${cometd-version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.cometd.java</groupId>
             <artifactId>cometd-java-annotations</artifactId>
-            <version>2.5.0</version>
-        </dependency>  
+            <version>${cometd-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>cometd-websocket-jetty</artifactId>
+            <version>${cometd-version}</version>
+        </dependency>        
         <dependency>
             <groupId>org.opencoweb</groupId>
             <artifactId>coweb-bots</artifactId>
@@ -159,7 +199,7 @@
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
-            <version>2.9.0</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency> 
             <groupId>org.slf4j</groupId>
@@ -219,7 +259,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-mongodb</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>1.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>
@@ -263,6 +303,31 @@
             <artifactId>commons-codec</artifactId>
             <version>1.7</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-client</artifactId>
+            <version>${jetty-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-websocket</artifactId>
+            <version>${jetty-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-jmx</artifactId>
+            <version>${jetty-version}</version>
+        </dependency>        
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${jetty-version}</version>
+        </dependency>        
     </dependencies>
     <organization>
     	<name>IRI</name>