Author: tchemit Date: 2013-01-07 21:49:15 +0100 (Mon, 07 Jan 2013) New Revision: 294 Url: http://chorem.org/projects/chorem/repository/revisions/294 Log: fix Build Modified: trunk/chorem-entities/pom.xml trunk/pom.xml Modified: trunk/chorem-entities/pom.xml =================================================================== --- trunk/chorem-entities/pom.xml 2013-01-07 17:54:07 UTC (rev 293) +++ trunk/chorem-entities/pom.xml 2013-01-07 20:49:15 UTC (rev 294) @@ -106,12 +106,7 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.chorem.chorem</groupId> - <artifactId>chorem-entities</artifactId> - <version>0.3-SNAPSHOT</version> - <type>jar</type> - </dependency> + </dependencies> <build> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-07 17:54:07 UTC (rev 293) +++ trunk/pom.xml 2013-01-07 20:49:15 UTC (rev 294) @@ -95,20 +95,18 @@ <opencsvVersion>2.3</opencsvVersion> <processPluginVersion>1.1</processPluginVersion> <eugenePluginVersion>2.6</eugenePluginVersion> - <nuitonUtilsVersion>2.6.5-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.5</nuitonUtilsVersion> <nuitonWebVersion>1.7</nuitonWebVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <wikittyVersion>3.9-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.2.3</struts2Version> - <struts2jqueryVersion>3.2.0</struts2jqueryVersion> - <xWorkCoreVersion>2.1.6</xWorkCoreVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> <h2Version>1.2.134</h2Version> <webmotionVersion>2.2</webmotionVersion> <jstlVersion>1.2</jstlVersion> + <nuitonJsVersion>0.1-SNAPSHOT</nuitonJsVersion> <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> @@ -166,36 +164,6 @@ </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-json-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-grid-plugin</artifactId> - <version>${struts2jqueryVersion}</version> - </dependency> - - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork-core</artifactId> - <version>${xWorkCoreVersion}</version> - </dependency> - - <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>${javaxMailVersion}</version> @@ -245,22 +213,30 @@ </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-spring-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-wro</artifactId> + <version>${nuitonJsVersion}</version> + </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-jquery</artifactId> + <version>1.8.3-1-SNAPSHOT</version> + </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - </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> </dependencies>