--- a/server/java/renkan-web/pom.xml Mon Oct 05 11:08:26 2015 +0200
+++ b/server/java/renkan-web/pom.xml Mon Oct 05 11:09:00 2015 +0200
@@ -5,17 +5,17 @@
<parent>
<groupId>org.iri_research.renkan</groupId>
<artifactId>renkan</artifactId>
- <version>0.7.11</version>
+ <version>0.12.11</version>
</parent>
<artifactId>renkan-web</artifactId>
<packaging>war</packaging>
<properties>
- <surefire-version>2.16</surefire-version>
+ <surefire-version>2.18</surefire-version>
<coweb-version>1.0.1-SNAPSHOT</coweb-version>
<cowebx-version>1.0</cowebx-version>
<jersey-version>2.5.1</jersey-version>
- <spring-version>3.2.6.RELEASE</spring-version>
+ <spring-version>3.2.9.RELEASE</spring-version>
<spring-data-mongodb-version>1.3.3.RELEASE</spring-data-mongodb-version>
<spring-security-version>3.2.0.RELEASE</spring-security-version>
<spring-data-commons-version>1.6.3.RELEASE</spring-data-commons-version>
@@ -46,6 +46,8 @@
<json-path-version>0.9.1</json-path-version>
<commons-io-version>2.4</commons-io-version>
<mongeez-version>0.9.4</mongeez-version>
+ <maven-compiler-plugin-version>3.3</maven-compiler-plugin-version>
+ <exec-maven-plugin-version>1.4.0</exec-maven-plugin-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -53,9 +55,27 @@
<defaultGoal>package</defaultGoal>
<plugins>
<plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <version>${exec-maven-plugin-version}</version>
+ <executions>
+ <execution><!-- Run client build -->
+ <id>Clident Build</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>node_modules/.bin/grunt</executable>
+ <workingDirectory>${basedir}/../../../client</workingDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>${maven-compiler-plugin-version}</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -601,15 +621,15 @@
<artifactId>spring-security-acl</artifactId>
<version>${spring-security-version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${spring-security-version}</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>de.undercouch</groupId>
- <artifactId>bson4jackson</artifactId>
- <version>${bson4jackson-version}</version>
+ <groupId>de.undercouch</groupId>
+ <artifactId>bson4jackson</artifactId>
+ <version>${bson4jackson-version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>