Mercurial Mercurial > renkan / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
server/pom.xml
branchuser_management
changeset 220 ecbb104cf3b6
parent 215 a282eebbc5e0
child 221 a392390de1a7 
--- a/server/pom.xml	Sun Oct 06 14:12:02 2013 +0200
+++ b/server/pom.xml	Wed Oct 16 17:32:51 2013 +0200
@@ -8,21 +8,37 @@
     <packaging>war</packaging>
 
     <properties>
-        <surefire-version>2.14</surefire-version>
-        <coweb-version>1.0</coweb-version>
+        <surefire-version>2.16</surefire-version>
+        <coweb-version>1.0.1-SNAPSHOT</coweb-version>
         <cowebx-version>1.0</cowebx-version>
-        <jersey-version>1.17.1</jersey-version>
+        <jersey-version>2.3.1</jersey-version>
         <spring-version>3.2.1.RELEASE</spring-version>
         <spring-data-mongodb-version>1.2.0.RELEASE</spring-data-mongodb-version>
         <spring-security-version>3.1.3.RELEASE</spring-security-version>
-        <jetty-version>8.1.10.v20130312</jetty-version>
+        <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
+        <spring-data-jpa-version>1.3.0.RELEASE</spring-data-jpa-version>
+        <jetty-plugin-version>8.1.13.v20130916</jetty-plugin-version>
+        <jetty-version>8.1.13.v20130916</jetty-version>
         <junit-version>4.10</junit-version>
         <thymeleaf-version>2.0.16</thymeleaf-version>
         <thymeleaf-springsecurity-version>2.0.0</thymeleaf-springsecurity-version>
-        <cometd-version>2.5.1</cometd-version>
-        <jackson-version>2.1.4</jackson-version>
+        <cometd-version>2.7.0</cometd-version>
+        <jackson-version>2.2.3</jackson-version>
         <joda-version>2.1</joda-version>
         <mongo-driver-version>2.11.0</mongo-driver-version>
+        <jaxrs-api-version>2.0</jaxrs-api-version>
+        <javax-annotation-version>1.2</javax-annotation-version>
+        <javax-inject-version>1</javax-inject-version>
+        <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
+        <javax-servlet-jstl-version>1.2</javax-servlet-jstl-version>
+        <javax-persistence-api-version>1.0.2</javax-persistence-api-version>
+        <javax-validation-api-version>1.1.0.CR2</javax-validation-api-version>
+        <hibernate-validator-version>4.2.0.Final</hibernate-validator-version>
+        <slf4j-log4j12-version>1.7.5</slf4j-log4j12-version>
+        <nekohtml-version>1.9.16</nekohtml-version>
+        <commons-codec-version>1.7</commons-codec-version>
+        <bson4jackson-version>2.1.1</bson4jackson-version>
+        <fasterxml-java-uuid-generator-version>3.1.3</fasterxml-java-uuid-generator-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -32,7 +48,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.1</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
@@ -42,7 +58,7 @@
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty-version}</version>
+                <version>${jetty-plugin-version}</version>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <webApp>
@@ -55,7 +71,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.3</version>
                 <configuration>
-                    <archive>                   
+                    <archive>
                         <manifest>
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
@@ -136,6 +152,15 @@
     </build>
     <repositories>
         <repository>
+            <id>lib</id>
+            <name>lib</name>
+            <releases>
+                <enabled>true</enabled>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+            <url>file://${project.basedir}/lib</url>
+        </repository>
+        <repository>
             <id>spring-maven-release</id>
             <name>Spring Maven Release Repository</name>
             <url>http://maven.springframework.org/release</url>
@@ -149,24 +174,39 @@
             <id>spring-release</id>
             <name>Spring Maven SNAPSHOT Repository</name>
             <url>http://repo.springsource.org/release</url>
-        </repository>        
+        </repository>
     </repositories>
     <dependencies>
         <dependency>  
             <groupId>javax.inject</groupId>  
             <artifactId>javax.inject</artifactId>  
-            <version>1</version>  
+            <version>${javax-inject-version}</version>  
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>${javax-servlet-api-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>${jaxrs-api-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.cometd.java</groupId>
+            <artifactId>bayeux-api</artifactId>
+            <version>${cometd-version}</version>
         </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>cometd-java-common</artifactId>
             <version>${cometd-version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>cometd-java-annotations</artifactId>
@@ -176,7 +216,7 @@
             <groupId>org.cometd.java</groupId>
             <artifactId>cometd-websocket-jetty</artifactId>
             <version>${cometd-version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.opencoweb</groupId>
             <artifactId>coweb-bots</artifactId>
@@ -200,20 +240,20 @@
             <type>war</type>
         </dependency>
         <dependency>
-        	<groupId>com.sun.jersey</groupId>
-        	<artifactId>jersey-server</artifactId>
-        	<version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
             <version>${jersey-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-spring</artifactId>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
             <version>${jersey-version}</version>
-            <exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
+            <artifactId>jersey-spring3</artifactId>
+            <version>${jersey-version}</version>
+            <!--exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-context</artifactId>
@@ -234,14 +274,14 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-aop</artifactId>
                 </exclusion>
-            </exclusions>
+            </exclusions-->
         </dependency>
-		<dependency>
-		    <groupId>com.sun.jersey.jersey-test-framework</groupId>
-		    <artifactId>jersey-test-framework-grizzly2</artifactId>
-		    <version>${jersey-version}</version>
-		    <scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+            <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+            <version>${jersey-version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mongodb</groupId>
             <artifactId>mongo-java-driver</artifactId>
@@ -250,7 +290,7 @@
         <dependency> 
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.2</version>
+            <version>${slf4j-log4j12-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -266,13 +306,13 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <version>${spring-version}</version>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
             <version>${spring-version}</version>
             <scope>test</scope>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
@@ -281,12 +321,12 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
-            <version>1.5.0.RELEASE</version>
+            <version>${spring-data-commons-version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
-            <version>1.3.0.RELEASE</version>
+            <version>${spring-data-jpa-version}</version>
         </dependency> 
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -296,18 +336,18 @@
         <dependency>
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>  
-            <version>1.0.2</version>
+            <version>${javax-persistence-api-version}</version>
         </dependency>
-        <dependency>                          
-            <groupId>junit</groupId>           
-            <artifactId>junit</artifactId>     
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <version>${junit-version}</version>
-            <scope>test</scope>                
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <version>${javax-servlet-jstl-version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -328,7 +368,22 @@
         <dependency>
             <groupId>net.sourceforge.nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
-            <version>1.9.16</version>
+            <version>${nekohtml-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -338,36 +393,11 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <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>
+            <version>${commons-codec-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>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
+            <groupId>org.eclipse.jetty.aggregate</groupId>
+            <artifactId>jetty-all</artifactId>
             <version>${jetty-version}</version>
         </dependency>
         <dependency>
@@ -398,7 +428,7 @@
         <dependency>
 	       <groupId>de.undercouch</groupId>
 	       <artifactId>bson4jackson</artifactId>
-	       <version>2.1.1</version>
+	       <version>${bson4jackson-version}</version>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -408,21 +438,21 @@
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <version>1.1.0.CR2</version>
+            <version>${javax-validation-api-version}</version>
         </dependency>        
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>4.2.0.Final</version>
+            <version>${hibernate-validator-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
-            <version>3.1.3</version>
+            <version>${fasterxml-java-uuid-generator-version}</version>
         </dependency>
     </dependencies>
     <organization>
-    	<name>IRI</name>
-    	<url>http://www.iri.centrepompidou.fr</url>
+        <name>IRI</name>
+        <url>http://www.iri.centrepompidou.fr</url>
     </organization>
 </project>
renkan