diff -r 90f6937c417e -r 37c9a17c3284 server/pom.xml --- a/server/pom.xml Tue Nov 13 11:46:39 2012 +0100 +++ b/server/pom.xml Tue Nov 06 13:23:19 2012 +0100 @@ -8,7 +8,10 @@ war - 0.8.3 + 0.8.3.1 + 1.14 + 3.1.2.RELEASE + 4.10 UTF-8 @@ -52,6 +55,16 @@ lib + + org.opencoweb.cowebx + cowebx-widgets-dojo + war + + META-INF/** + WEB-INF/** + + lib/cowebx/dojo + @@ -61,13 +74,42 @@ **/data + + src/main/web-resources + - + + + spring-maven-release + Spring Maven Release Repository + http://maven.springframework.org/release + + + spring-maven-milestone + Spring Maven MILESTONE Repository + http://maven.springframework.org/milestone + + + + javax.inject + javax.inject + 1 + + + javax.servlet + servlet-api + 2.5 + + + org.cometd.java + cometd-java-annotations + 2.5.0 + org.opencoweb coweb-bots @@ -85,25 +127,91 @@ war + org.opencoweb.cowebx + cowebx-widgets-dojo + ${coweb-version} + war + + com.sun.jersey jersey-server - 1.13 + ${jersey-version} - com.sun.jersey - jersey-servlet - 1.13 + com.sun.jersey.contribs + jersey-spring + ${jersey-version} + + + org.springframework + spring-context + + + org.springframework + spring-beans + + + org.springframework + spring-core + + org.mongodb mongo-java-driver - 2.8.0 + 2.9.0 org.slf4j slf4j-log4j12 1.6.6 + + org.springframework + spring-core + ${spring-version} + + + org.springframework + spring-context + ${spring-version} + + + org.springframework + spring-web + ${spring-version} + + + org.springframework + spring-test + ${spring-version} + + + org.springframework.data + spring-data-commons-core + 1.4.0.RELEASE + + + org.springframework.data + spring-data-jpa + 1.2.0.RELEASE + + + org.springframework.data + spring-data-mongodb + 1.1.0.RELEASE + + + javax.persistence + persistence-api + 1.0.2 + + + junit + junit + ${junit.version} + test + IRI