diff -r 1e1791dfc9e4 -r 105ddd569ff7 server/java/renkan-web/pom.xml --- 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 @@ org.iri_research.renkan renkan - 0.7.11 + 0.12.11 renkan-web war - 2.16 + 2.18 1.0.1-SNAPSHOT 1.0 2.5.1 - 3.2.6.RELEASE + 3.2.9.RELEASE 1.3.3.RELEASE 3.2.0.RELEASE 1.6.3.RELEASE @@ -46,6 +46,8 @@ 0.9.1 2.4 0.9.4 + 3.3 + 1.4.0 UTF-8 @@ -53,9 +55,27 @@ package + exec-maven-plugin + org.codehaus.mojo + ${exec-maven-plugin-version} + + + Clident Build + generate-sources + + exec + + + node_modules/.bin/grunt + ${basedir}/../../../client + + + + + org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-plugin-version} 1.7 1.7 @@ -601,15 +621,15 @@ spring-security-acl ${spring-security-version} - + org.springframework.security spring-security-taglibs ${spring-security-version} - + - de.undercouch - bson4jackson - ${bson4jackson-version} + de.undercouch + bson4jackson + ${bson4jackson-version} joda-time