Author: echatellier Date: 2013-03-18 19:03:25 +0100 (Mon, 18 Mar 2013) New Revision: 330 Url: http://chorem.org/projects/chorem/repository/revisions/330 Log: Fix build, and use nuiton-js (stable 1.0 version) Modified: trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java trunk/pom.xml Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2013-03-07 19:34:33 UTC (rev 329) +++ trunk/chorem-webmotion/pom.xml 2013-03-18 18:03:25 UTC (rev 330) @@ -40,12 +40,11 @@ <dependencies> <!-- compile dependencies --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -59,8 +58,7 @@ <dependency> <groupId>org.chorem.chorem</groupId> <artifactId>chorem-entities</artifactId> - <version>0.3-SNAPSHOT</version> - <type>jar</type> + <version>${project.version}</version> </dependency> <dependency> Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2013-03-07 19:34:33 UTC (rev 329) +++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2013-03-18 18:03:25 UTC (rev 330) @@ -23,7 +23,6 @@ package org.chorem.webmotion.actions; -import com.kenai.jaffl.annotations.Pinned; import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.ByteArrayInputStream; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-07 19:34:33 UTC (rev 329) +++ trunk/pom.xml 2013-03-18 18:03:25 UTC (rev 330) @@ -125,117 +125,117 @@ <scope>runtime</scope> </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>${opencsvVersion}</version> - </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>${opencsvVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.web</groupId> - <artifactId>nuiton-struts2</artifactId> - <version>${nuitonWebVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>${javaxMailVersion}</version> - </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javaxMailVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servletApiVersion}</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletApiVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>${jspApiVersion}</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspApiVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${wikittyVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${wikittyVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${wikittyVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>1.8.3-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-ui</artifactId> - <version>1.9.2-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jqplot</artifactId> - <version>1.0.4r1121-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - <version>2.2.2-1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-tokeninput</artifactId> - <version>1.6.0.0-1-SNAPSHOT</version> - </dependency> - <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-wro</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery</artifactId> + <version>1.8.3-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-ui</artifactId> + <version>1.9.2-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jqplot</artifactId> + <version>1.0.4r1121-1</version> + </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-bootstrap</artifactId> + <version>2.2.2-1</version> + </dependency> + <!-- <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery-tokeninput</artifactId> + <version>1.6.0.0-1-SNAPSHOT</version> + </dependency> --> + + <dependency> <groupId>org.debux.webmotion</groupId> <artifactId>webmotion</artifactId> <version>${webmotionVersion}</version>